diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-17 10:46:18 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-17 10:46:18 +0100 |
commit | 9dacc71ff31a008d1e689fc824d31f6696454f68 (patch) | |
tree | b792f9c30008e1ed469a73ead4339fdf8a50a5ce /arch/x86/include/asm | |
parent | 19f47c634ea8c5a10ff7bb1a08c52fd0f49bc54c (diff) | |
parent | 9bf1a2445f3c569098b8de7097ca324e65abecc2 (diff) |
Merge commit 'v2.6.28-rc5' into x86/cleanups
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r-- | arch/x86/include/asm/acpi.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/iommu.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 8d676d8ecde..9830681446a 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); diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h index e4a552d4446..0b500c5b644 100644 --- a/arch/x86/include/asm/iommu.h +++ b/arch/x86/include/asm/iommu.h @@ -6,7 +6,6 @@ extern void no_iommu_init(void); extern struct dma_mapping_ops nommu_dma_ops; extern int force_iommu, no_iommu; extern int iommu_detected; -extern int dmar_disabled; extern unsigned long iommu_nr_pages(unsigned long addr, unsigned long len); |