diff options
| author | Len Brown <len.brown@intel.com> | 2008-11-11 21:14:11 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-11 21:14:11 -0500 |
| commit | 3e0fe364835cecc8560cf32bb9609f4c56c5d9fa (patch) | |
| tree | be2236bd4f6f16aee24cca5217449dc03a6c1e85 /arch/x86/include | |
| parent | e911d27af43e7d28d59a96a4682e8942f0661469 (diff) | |
| parent | 32836259ff25ce97010569706cd33ba94de81d62 (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'arch/x86/include')
| -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); |