Commit 2621c1ff authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] pnpacpi build fix

- Fix it for older C compilers.

- Extern decls always, always, always go in header files, please.

Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 450dbdf8
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/acpi.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/desc.h> #include <asm/desc.h>
...@@ -539,7 +540,6 @@ int __init pnpbios_init(void) ...@@ -539,7 +540,6 @@ int __init pnpbios_init(void)
} }
#ifdef CONFIG_PNPACPI #ifdef CONFIG_PNPACPI
extern int pnpacpi_disabled;
if (!acpi_disabled && !pnpacpi_disabled) { if (!acpi_disabled && !pnpacpi_disabled) {
pnpbios_disabled = 1; pnpbios_disabled = 1;
printk(KERN_INFO "PnPBIOS: Disabled by ACPI PNP\n"); printk(KERN_INFO "PnPBIOS: Disabled by ACPI PNP\n");
......
...@@ -532,4 +532,7 @@ static inline int acpi_get_pxm(acpi_handle handle) ...@@ -532,4 +532,7 @@ static inline int acpi_get_pxm(acpi_handle handle)
return 0; return 0;
} }
#endif #endif
extern int pnpacpi_disabled;
#endif /*_LINUX_ACPI_H*/ #endif /*_LINUX_ACPI_H*/
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment