summaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-08-25 04:19:05 +0200
committerLen Brown <len.brown@intel.com>2007-08-25 04:19:05 +0200
commit5a16eff86dc1194a17c69250492e820d828e3bde (patch)
treea0f990ce8682d7108f6fbd7f9d3c90a8d318d9b8 /arch/i386
parentPull battery into release branch (diff)
parentACPI: boot correctly with "nosmp" or "maxcpus=0" (diff)
downloadlinux-5a16eff86dc1194a17c69250492e820d828e3bde.tar.xz
linux-5a16eff86dc1194a17c69250492e820d828e3bde.zip
Pull bugzilla-1641 into release branch
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/io_apic.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 4b8a8da4b2e0..e2f4a1c68547 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -754,14 +754,6 @@ static int pirq_entries [MAX_PIRQS];
static int pirqs_enabled;
int skip_ioapic_setup;
-static int __init ioapic_setup(char *str)
-{
- skip_ioapic_setup = 1;
- return 1;
-}
-
-__setup("noapic", ioapic_setup);
-
static int __init ioapic_pirq_setup(char *str)
{
int i, max;