summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2012-01-17 10:32:48 -0500
committerDave Jones <davej@redhat.com>2012-01-17 10:32:48 -0500
commit7b9de460861b74bf70730440c01b05494dd6e209 (patch)
tree2701c2128bec67f8fd36bef9e37ab49a2285cb54
parent9db946276054ce4cd0d254ce9f2a958ce48b0221 (diff)
downloadkernel-7b9de460861b74bf70730440c01b05494dd6e209.tar.gz
kernel-7b9de460861b74bf70730440c01b05494dd6e209.tar.xz
kernel-7b9de460861b74bf70730440c01b05494dd6e209.zip
Remove CONFIG_BLK_DEV_AMD74XX duplicate entries
-rw-r--r--TODO2
-rw-r--r--config-powerpc-generic1
-rw-r--r--config-x86-32-generic2
-rw-r--r--config-x86_64-generic3
4 files changed, 0 insertions, 8 deletions
diff --git a/TODO b/TODO
index 2ab00f1fc..652000ee2 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,5 @@
Config TODOs:
-* disable CONFIG_ISA everywhere.
* review & disable a bunch of the I2C, RTC, DVB, SOUND options.
-* clean up CONFIG_BLK_DEV_AMD74XX
Spec file TODOs:
diff --git a/config-powerpc-generic b/config-powerpc-generic
index 2ca0c3e83..2b35251ed 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -140,7 +140,6 @@ CONFIG_IDE_TASK_IOCTL=y
# CONFIG_BLK_DEV_IDEPCI is not set
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
# CONFIG_BLK_DEV_CY82C693 is not set
diff --git a/config-x86-32-generic b/config-x86-32-generic
index 3b55ae521..6a9dc415f 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -96,8 +96,6 @@ CONFIG_PCI_DIRECT=y
# SHPC has half-arsed PCI probing, which makes it load on too many systems
# CONFIG_HOTPLUG_PCI_SHPC is not set
-CONFIG_BLK_DEV_AMD74XX=y
-
CONFIG_I2C_ALI1535=m
CONFIG_I2C_ALI15X3=m
CONFIG_I2C_ALI1563=m
diff --git a/config-x86_64-generic b/config-x86_64-generic
index f5bbf9f57..586b010fa 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -34,9 +34,6 @@ CONFIG_ACPI_HOTPLUG_MEMORY=m
# SHPC has half-arsed PCI probing, which makes it load on too many systems
CONFIG_HOTPLUG_PCI_SHPC=m
-# Really ? not 32bit only ?
-CONFIG_BLK_DEV_AMD74XX=y
-
CONFIG_CRYPTO_AES_X86_64=y
CONFIG_CRYPTO_TWOFISH_X86_64=m
CONFIG_CRYPTO_SALSA20_X86_64=m