forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'linus' into test

Browse source 
Conflicts:
	MAINTAINERS
	arch/x86/kernel/acpi/boot.c
	arch/x86/kernel/acpi/sleep.c
	drivers/acpi/Kconfig
	drivers/pnp/Makefile
	drivers/pnp/quirks.c

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown 2008-10-22 23:57:26 -04:00
commit 057316cc6a
7289 changed files with 579470 additions and 188945 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/linux/pnp.h
View file

@ -22,9 +22,11 @@ struct pnp_dev;
* Resource Management
*/
#ifdef CONFIG_PNP
struct resource *pnp_get_resource(struct pnp_dev *, unsigned int, unsigned int);
struct resource *pnp_get_resource(struct pnp_dev *dev, unsigned long type,
unsigned int num);
#else
static inline struct resource *pnp_get_resource(struct pnp_dev *dev, unsigned int type, unsigned int num)
static inline struct resource *pnp_get_resource(struct pnp_dev *dev,
unsigned long type, unsigned int num)
{
return NULL;
}