git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-nvram
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
include
/
asm
/
acpi.h
diff --git
a/arch/x86/include/asm/acpi.h
b/arch/x86/include/asm/acpi.h
index 8d676d8ecde93d2bd0f76f5891ea5982970aae8a..9830681446ad4346bacfbbed00efdb95e52eca14 100644
(file)
--- a/
arch/x86/include/asm/acpi.h
+++ b/
arch/x86/include/asm/acpi.h
@@
-113,7
+113,6
@@
static inline void acpi_disable_pci(void)
acpi_pci_disabled = 1;
acpi_noirq_set();
}
-extern int acpi_irq_balance_set(char *str);
/* routines for saving/restoring kernel state */
extern int acpi_save_state_mem(void);