Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.cz>2011-09-21 11:11:10 +0200
committerMichal Hocko <mhocko@suse.cz>2011-09-21 11:18:53 +0200
commitc985824c61c0cf24c5496ee116ef5b4cbb99b6f8 (patch)
tree4a7a7cc7e4b51250e2a49518b77f1cec8a9a2d8c
parente55423f3e616bd5f9462c44b5330b3a2c6e9b9c1 (diff)
Update config files.
Clean run_oldconfig.sh run to get configs into sync
-rw-r--r--config/ia64/debug1
-rw-r--r--config/ia64/default1
-rw-r--r--config/ia64/trace1
3 files changed, 0 insertions, 3 deletions
diff --git a/config/ia64/debug b/config/ia64/debug
index d679d59b8e..acd69975c0 100644
--- a/config/ia64/debug
+++ b/config/ia64/debug
@@ -346,7 +346,6 @@ CONFIG_ACPI_THERMAL=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
-# CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set
CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_DEBUG=y
# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
diff --git a/config/ia64/default b/config/ia64/default
index d1f3eb6dcb..dbdc00c1da 100644
--- a/config/ia64/default
+++ b/config/ia64/default
@@ -346,7 +346,6 @@ CONFIG_ACPI_THERMAL=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
-# CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set
CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_PCI_SLOT=m
diff --git a/config/ia64/trace b/config/ia64/trace
index eccbb0b255..1c8406cd37 100644
--- a/config/ia64/trace
+++ b/config/ia64/trace
@@ -346,7 +346,6 @@ CONFIG_ACPI_THERMAL=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
-# CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set
CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_PCI_SLOT=m