aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup_32.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 07:30:16 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:30:16 -0500
commit376ff0352c24a5fa47f1250dd60937b5a9077672 (patch)
tree7f5b8a260e2eb65eb9e71aa0639f7ef4825d4a40 /arch/x86/kernel/setup_32.c
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 'arch/x86/kernel/setup_32.c')
-rw-r--r--arch/x86/kernel/setup_32.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index 51bdc0b1b72e..236d30b264d8 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -44,6 +44,7 @@
44#include <linux/crash_dump.h> 44#include <linux/crash_dump.h>
45#include <linux/dmi.h> 45#include <linux/dmi.h>
46#include <linux/pfn.h> 46#include <linux/pfn.h>
47#include <linux/pci.h>
47 48
48#include <video/edid.h> 49#include <video/edid.h>
49 50
@@ -663,9 +664,7 @@ void __init setup_arch(char **cmdline_p)
663 acpi_boot_table_init(); 664 acpi_boot_table_init();
664#endif 665#endif
665 666
666#ifdef CONFIG_PCI
667 early_quirks(); 667 early_quirks();
668#endif
669 668
670#ifdef CONFIG_ACPI 669#ifdef CONFIG_ACPI
671 acpi_boot_init(); 670 acpi_boot_init();