aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 13:30:16 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:30:16 +0100
commit376ff0352c24a5fa47f1250dd60937b5a9077672 (patch)
tree7f5b8a260e2eb65eb9e71aa0639f7ef4825d4a40 /include
parent63fefb7d5bac6e65b5df2b7eb4aa56bb4bbadd48 (diff)
x86: move acpi and pci declarations
Move acpi/pci related declarations to the correct headers and remove the duplicate. Build fix from: Andrew Morton Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/acpi_32.h2
-rw-r--r--include/asm-x86/pci.h4
-rw-r--r--include/asm-x86/proto.h3
3 files changed, 3 insertions, 6 deletions
diff --git a/include/asm-x86/acpi_32.h b/include/asm-x86/acpi_32.h
index 723493e6c85..3cce5a0f2d9 100644
--- a/include/asm-x86/acpi_32.h
+++ b/include/asm-x86/acpi_32.h
@@ -81,8 +81,6 @@ int __acpi_release_global_lock(unsigned int *lock);
:"=r"(n_hi), "=r"(n_lo) \
:"0"(n_hi), "1"(n_lo))
-extern void early_quirks(void);
-
#ifdef CONFIG_ACPI
extern int acpi_lapic;
extern int acpi_ioapic;
diff --git a/include/asm-x86/pci.h b/include/asm-x86/pci.h
index e8836196634..6983730d86f 100644
--- a/include/asm-x86/pci.h
+++ b/include/asm-x86/pci.h
@@ -66,6 +66,7 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
#ifdef CONFIG_PCI
+extern void early_quirks(void);
static inline void pci_dma_burst_advice(struct pci_dev *pdev,
enum pci_dma_burst_strategy *strat,
unsigned long *strategy_parameter)
@@ -73,9 +74,10 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
*strat = PCI_DMA_BURST_INFINITY;
*strategy_parameter = ~0UL;
}
+#else
+static inline void early_quirks(void) { }
#endif
-
#endif /* __KERNEL__ */
#ifdef CONFIG_X86_32
diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h
index dabba55f7ed..64fe816ea37 100644
--- a/include/asm-x86/proto.h
+++ b/include/asm-x86/proto.h
@@ -58,8 +58,6 @@ extern void show_registers(struct pt_regs *regs);
extern void exception_table_check(void);
-extern void acpi_reserve_bootmem(void);
-
extern void swap_low_mappings(void);
extern void __show_regs(struct pt_regs * regs);
@@ -69,7 +67,6 @@ extern void syscall32_cpu_init(void);
extern void setup_node_bootmem(int nodeid, unsigned long start, unsigned long end);
-extern void early_quirks(void);
extern void check_efer(void);
extern void select_idle_routine(const struct cpuinfo_x86 *c);