summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-11-11 21:14:11 -0500
committerLen Brown <len.brown@intel.com>2008-11-11 21:14:11 -0500
commit3e0fe364835cecc8560cf32bb9609f4c56c5d9fa (patch)
treebe2236bd4f6f16aee24cca5217449dc03a6c1e85 /arch/x86/include
parente911d27af43e7d28d59a96a4682e8942f0661469 (diff)
parent32836259ff25ce97010569706cd33ba94de81d62 (diff)
downloadop-kernel-dev-3e0fe364835cecc8560cf32bb9609f4c56c5d9fa.zip
op-kernel-dev-3e0fe364835cecc8560cf32bb9609f4c56c5d9fa.tar.gz
Merge branch 'misc' into release
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/acpi.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 8d676d8..9830681 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)
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);
OpenPOWER on IntegriCloud