diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 13:30:16 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:30:16 +0100 |
| commit | 376ff0352c24a5fa47f1250dd60937b5a9077672 (patch) | |
| tree | 7f5b8a260e2eb65eb9e71aa0639f7ef4825d4a40 /arch | |
| parent | 63fefb7d5bac6e65b5df2b7eb4aa56bb4bbadd48 (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 'arch')
| -rw-r--r-- | arch/x86/kernel/setup_32.c | 3 | ||||
| -rw-r--r-- | arch/x86/kernel/setup_64.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 51bdc0b1b72..236d30b264d 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c @@ -44,6 +44,7 @@ #include <linux/crash_dump.h> #include <linux/dmi.h> #include <linux/pfn.h> +#include <linux/pci.h> #include <video/edid.h> @@ -663,9 +664,7 @@ void __init setup_arch(char **cmdline_p) acpi_boot_table_init(); #endif -#ifdef CONFIG_PCI early_quirks(); -#endif #ifdef CONFIG_ACPI acpi_boot_init(); diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index ec976edf039..97a497652d2 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c @@ -407,9 +407,7 @@ void __init setup_arch(char **cmdline_p) reserve_crashkernel(); paging_init(); -#ifdef CONFIG_PCI early_quirks(); -#endif /* * set this early, so we dont allocate cpu0 |