lkml.org 
[lkml]   [2006]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 2/3] x86: remove duplicated parser for "pci=noacpi"

[PATCH 2/3] x86: remove duplicated parser for "pci=noacpi"
Remove "pci=noacpi" parse in acpi/boot.c, because it is duplicated
with that in pci/common.c.

Signed-off-by: Yinghai Lu <yinghai.lu@amd.com>

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index d12fb97..6d62dd1 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -1285,15 +1293,6 @@ static int __init parse_acpi(char *arg)
}
early_param("acpi", parse_acpi);

-/* FIXME: Using pci= for an ACPI parameter is a travesty. */
-static int __init parse_pci(char *arg)
-{
- if (arg && strcmp(arg, "noacpi") == 0)
- acpi_disable_pci();
- return 0;
-}
-early_param("pci", parse_pci);
-
#ifdef CONFIG_X86_IO_APIC
static int __init parse_acpi_skip_timer_override(char *arg)
{
diff --git a/arch/i386/pci/common.c b/arch/i386/pci/common.c
index cdfcf97..6d5b70a 100644
--- a/arch/i386/pci/common.c
+++ b/arch/i386/pci/common.c
@@ -294,7 +294,7 @@ char * __devinit pcibios_setup(char *str)
}
#endif
else if (!strcmp(str, "noacpi")) {
- acpi_noirq_set();
+ acpi_disable_pci();
return NULL;
}
else if (!strcmp(str, "noearly")) {
\
 
 \ /
  Last update: 2006-11-27 00:27    [from the cache]
©2003-2011 Jasper Spaans