Unset CONFIG_IDE on archs amd64/x86/default (bug #357213)

diff --git a/ChangeLog b/ChangeLog
index 3c8c32aadccf921d6244d464f3c812ddb1ab80d5..20eca7c3bb125f211590ef2b7803c2d4a1bffddf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  13 Jun 2011; Sebastian Pipping <sping@gentoo.org> arch/x86/kernel-config,
+  arch/x86_64/kernel-config, defaults/kernel-config:
+  Unset CONFIG_IDE on archs amd64/x86/default (bug #357213)
+
   07 Jun 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.16
 

diff --git a/arch/x86/kernel-config b/arch/x86/kernel-config
index 829ad84c10bb3aa576d66ea4385e682c04ca166c..ab38c09dcf11c3fb27280246f25a65e4bb826587 100644 (file)
--- a/arch/x86/kernel-config
+++ b/arch/x86/kernel-config
@@ -1041,7 +1041,7 @@ CONFIG_SONYPI_COMPAT=y
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
 CONFIG_THINKPAD_ACPI_BAY=y
-CONFIG_IDE=y
+# CONFIG_IDE is not set
 CONFIG_BLK_DEV_IDE=y
 
 #

diff --git a/arch/x86_64/kernel-config b/arch/x86_64/kernel-config
index cc714c299bc1f5652f19b6af55af2f1eb319e51f..ef43dc1181ed8db2f106c156aa77b6bb9242d8b8 100644 (file)
--- a/arch/x86_64/kernel-config
+++ b/arch/x86_64/kernel-config
@@ -1097,7 +1097,7 @@ CONFIG_EEPROM_93CX6=m
 # CONFIG_CB710_CORE is not set
 # CONFIG_IWMC3200TOP is not set
 CONFIG_HAVE_IDE=y
-CONFIG_IDE=y
+# CONFIG_IDE is not set
 
 #
 # Please see Documentation/ide/ide.txt for help/info on IDE drives

diff --git a/defaults/kernel-config b/defaults/kernel-config
index 62de5e77e48a6ef6520ee058627ed3c9a7dd4164..9ea854bf0d7d5993db094907248a175d2333f8d3 100644 (file)
--- a/defaults/kernel-config
+++ b/defaults/kernel-config
@@ -1041,7 +1041,7 @@ CONFIG_SONYPI_COMPAT=y
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
 CONFIG_THINKPAD_ACPI_BAY=y
-CONFIG_IDE=y
+# CONFIG_IDE is not set
 CONFIG_BLK_DEV_IDE=y
 
 #