aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/setup.c
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-09-26 04:52:33 -0400
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 04:52:33 -0400
commitdf3bb57d2c0160ccd1ee51322f50aa295c3b0858 (patch)
tree056c22f744540d288d1ad7b5422465f66c645580 /arch/i386/kernel/setup.c
parent43c85c9c5dff76efc1e411d3302840027ea92004 (diff)
[PATCH] i386/x86-64: Move acpi_disabled variables into acpi/boot.c
Removes code duplication between i386/x86-64. Not needed anymore in setup.c since early_param cleanup Cc: len.brown@intel.com Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/i386/kernel/setup.c')
-rw-r--r--arch/i386/kernel/setup.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index c6e31ed386f5..ea17567dbe72 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -89,13 +89,6 @@ EXPORT_SYMBOL(boot_cpu_data);
89 89
90unsigned long mmu_cr4_features; 90unsigned long mmu_cr4_features;
91 91
92#ifdef CONFIG_ACPI
93 int acpi_disabled = 0;
94#else
95 int acpi_disabled = 1;
96#endif
97EXPORT_SYMBOL(acpi_disabled);
98
99/* for MCA, but anyone else can use it if they want */ 92/* for MCA, but anyone else can use it if they want */
100unsigned int machine_id; 93unsigned int machine_id;
101#ifdef CONFIG_MCA 94#ifdef CONFIG_MCA