Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Renninger <trenn@suse.de>2011-08-09 00:03:53 +0200
committerThomas Renninger <trenn@suse.de>2011-08-09 00:03:53 +0200
commitf1af972d0e0bea6f6ded52b55e4758d0d4eab9cf (patch)
tree5a0f8b20823ac807704bb984f510f333382f25ea
parent2678be80480b43f3fae31db87f7c58a9d146cc5e (diff)
Update config files:
bnc#674988, change: -CONFIG_ACPI_CUSTOM_METHOD=m +# CONFIG_ACPI_CUSTOM_METHOD is not set for all flavors
-rw-r--r--config/i386/debug2
-rw-r--r--config/i386/default2
-rw-r--r--config/i386/desktop2
-rw-r--r--config/i386/pae2
-rw-r--r--config/i386/trace2
-rw-r--r--config/i386/vanilla2
-rw-r--r--config/i386/xen2
-rw-r--r--config/ia64/debug2
-rw-r--r--config/ia64/default2
-rw-r--r--config/ia64/trace2
-rw-r--r--config/ia64/vanilla2
-rw-r--r--config/sparc64/default4
-rw-r--r--config/sparc64/net4
-rw-r--r--config/x86_64/debug2
-rw-r--r--config/x86_64/default2
-rw-r--r--config/x86_64/desktop2
-rw-r--r--config/x86_64/trace2
-rw-r--r--config/x86_64/vanilla2
-rw-r--r--config/x86_64/xen2
19 files changed, 21 insertions, 21 deletions
diff --git a/config/i386/debug b/config/i386/debug
index 644a641a67..f80cd571da 100644
--- a/config/i386/debug
+++ b/config/i386/debug
@@ -520,7 +520,7 @@ CONFIG_X86_PM_TIMER=y
CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=m
CONFIG_ACPI_APEI_PCIEAER=y
diff --git a/config/i386/default b/config/i386/default
index 05dd435062..2c47d626c0 100644
--- a/config/i386/default
+++ b/config/i386/default
@@ -504,7 +504,7 @@ CONFIG_X86_PM_TIMER=y
CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=m
CONFIG_ACPI_APEI_PCIEAER=y
diff --git a/config/i386/desktop b/config/i386/desktop
index eba2f5f4be..38963b6e19 100644
--- a/config/i386/desktop
+++ b/config/i386/desktop
@@ -522,7 +522,7 @@ CONFIG_X86_PM_TIMER=y
CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=m
CONFIG_ACPI_APEI_PCIEAER=y
diff --git a/config/i386/pae b/config/i386/pae
index 10dd5b9161..0e6fd87cc5 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -521,7 +521,7 @@ CONFIG_X86_PM_TIMER=y
CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=m
CONFIG_ACPI_APEI_PCIEAER=y
diff --git a/config/i386/trace b/config/i386/trace
index a567afd3bd..620c6eeb6a 100644
--- a/config/i386/trace
+++ b/config/i386/trace
@@ -521,7 +521,7 @@ CONFIG_X86_PM_TIMER=y
CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=m
CONFIG_ACPI_APEI_PCIEAER=y
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 25b69bcdb7..12fda6ff73 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -497,7 +497,7 @@ CONFIG_X86_PM_TIMER=y
CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=m
CONFIG_ACPI_APEI_PCIEAER=y
diff --git a/config/i386/xen b/config/i386/xen
index 0fb7f323fc..a4872303f5 100644
--- a/config/i386/xen
+++ b/config/i386/xen
@@ -428,7 +428,7 @@ CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_HOTPLUG_MEMORY=m
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=m
CONFIG_ACPI_APEI_PCIEAER=y
diff --git a/config/ia64/debug b/config/ia64/debug
index c20ac7ff02..31ed37f2a9 100644
--- a/config/ia64/debug
+++ b/config/ia64/debug
@@ -347,7 +347,7 @@ CONFIG_ACPI_DEBUG=y
CONFIG_ACPI_PCI_SLOT=m
CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
#
# CPU Frequency scaling
diff --git a/config/ia64/default b/config/ia64/default
index 6b52e8e660..2643a9130f 100644
--- a/config/ia64/default
+++ b/config/ia64/default
@@ -346,7 +346,7 @@ CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_PCI_SLOT=m
CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
#
# CPU Frequency scaling
diff --git a/config/ia64/trace b/config/ia64/trace
index 1644af8dcb..38015864e7 100644
--- a/config/ia64/trace
+++ b/config/ia64/trace
@@ -346,7 +346,7 @@ CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_PCI_SLOT=m
CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
#
# CPU Frequency scaling
diff --git a/config/ia64/vanilla b/config/ia64/vanilla
index 9b3b0a19b3..98ad1fb408 100644
--- a/config/ia64/vanilla
+++ b/config/ia64/vanilla
@@ -344,7 +344,7 @@ CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_PCI_SLOT=m
CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
#
# CPU Frequency scaling
diff --git a/config/sparc64/default b/config/sparc64/default
index a0e2fb31de..300a795e96 100644
--- a/config/sparc64/default
+++ b/config/sparc64/default
@@ -5159,7 +5159,7 @@ CONFIG_CPU_RMAP=y
+# CONFIG_MELAN is not set
+CONFIG_CLEANCACHE=y
+# CONFIG_PM_TEST_SUSPEND is not set
-+CONFIG_ACPI_CUSTOM_METHOD=m
++# CONFIG_ACPI_CUSTOM_METHOD is not set
+# x86 CPU frequency scaling drivers
+CONFIG_NET_SCH_QFQ=m
+CONFIG_RFKILL_REGULATOR=m
@@ -5280,7 +5280,7 @@ CONFIG_CPU_RMAP=y
# CONFIG_MELAN is not set
CONFIG_CLEANCACHE=y
# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
# x86 CPU frequency scaling drivers
CONFIG_NET_SCH_QFQ=m
CONFIG_RFKILL_REGULATOR=m
diff --git a/config/sparc64/net b/config/sparc64/net
index 0b7eef78b1..be4aa538fc 100644
--- a/config/sparc64/net
+++ b/config/sparc64/net
@@ -2049,7 +2049,7 @@ CONFIG_CPU_RMAP=y
+# CONFIG_MELAN is not set
+CONFIG_CLEANCACHE=y
+# CONFIG_PM_TEST_SUSPEND is not set
-+CONFIG_ACPI_CUSTOM_METHOD=m
++# CONFIG_ACPI_CUSTOM_METHOD is not set
+# x86 CPU frequency scaling drivers
+CONFIG_NET_SCH_QFQ=m
+CONFIG_RFKILL_REGULATOR=m
@@ -2170,7 +2170,7 @@ CONFIG_CPU_RMAP=y
# CONFIG_MELAN is not set
CONFIG_CLEANCACHE=y
# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
# x86 CPU frequency scaling drivers
CONFIG_NET_SCH_QFQ=m
CONFIG_RFKILL_REGULATOR=m
diff --git a/config/x86_64/debug b/config/x86_64/debug
index c61ca99fa0..ff5d3d04ed 100644
--- a/config/x86_64/debug
+++ b/config/x86_64/debug
@@ -485,7 +485,7 @@ CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_HOTPLUG_MEMORY=m
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=m
CONFIG_ACPI_APEI_PCIEAER=y
diff --git a/config/x86_64/default b/config/x86_64/default
index 2d7505ad57..cb0ea53125 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -485,7 +485,7 @@ CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_HOTPLUG_MEMORY=m
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=m
CONFIG_ACPI_APEI_PCIEAER=y
diff --git a/config/x86_64/desktop b/config/x86_64/desktop
index 8c0060defc..820118db5d 100644
--- a/config/x86_64/desktop
+++ b/config/x86_64/desktop
@@ -486,7 +486,7 @@ CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_HOTPLUG_MEMORY=m
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=m
CONFIG_ACPI_APEI_PCIEAER=y
diff --git a/config/x86_64/trace b/config/x86_64/trace
index 7a27f7c9e7..36ea8cfb80 100644
--- a/config/x86_64/trace
+++ b/config/x86_64/trace
@@ -485,7 +485,7 @@ CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_HOTPLUG_MEMORY=m
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=m
CONFIG_ACPI_APEI_PCIEAER=y
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 84912b99e1..28b4bb2bdc 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -476,7 +476,7 @@ CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_HOTPLUG_MEMORY=m
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=m
CONFIG_ACPI_APEI_PCIEAER=y
diff --git a/config/x86_64/xen b/config/x86_64/xen
index 6933dcaa07..6c8f134f1e 100644
--- a/config/x86_64/xen
+++ b/config/x86_64/xen
@@ -398,7 +398,7 @@ CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_HOTPLUG_MEMORY=m
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=m
CONFIG_ACPI_APEI_PCIEAER=y