diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-17 04:46:18 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-17 04:46:18 -0500 |
| commit | 9dacc71ff31a008d1e689fc824d31f6696454f68 (patch) | |
| tree | b792f9c30008e1ed469a73ead4339fdf8a50a5ce /arch/x86/include/asm/acpi.h | |
| parent | 19f47c634ea8c5a10ff7bb1a08c52fd0f49bc54c (diff) | |
| parent | 9bf1a2445f3c569098b8de7097ca324e65abecc2 (diff) | |
Merge commit 'v2.6.28-rc5' into x86/cleanups
Diffstat (limited to 'arch/x86/include/asm/acpi.h')
| -rw-r--r-- | arch/x86/include/asm/acpi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 8d676d8ecde9..9830681446ad 100644 --- 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) | |||
| 113 | acpi_pci_disabled = 1; | 113 | acpi_pci_disabled = 1; |
| 114 | acpi_noirq_set(); | 114 | acpi_noirq_set(); |
| 115 | } | 115 | } |
| 116 | extern int acpi_irq_balance_set(char *str); | ||
| 117 | 116 | ||
| 118 | /* routines for saving/restoring kernel state */ | 117 | /* routines for saving/restoring kernel state */ |
| 119 | extern int acpi_save_state_mem(void); | 118 | extern int acpi_save_state_mem(void); |