diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-05-25 17:07:11 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-05-25 17:38:30 -0400 |
| commit | 43fbac19f27b01b98972e3cb4876649164ef1b2d (patch) | |
| tree | bba5deb7946c84b54446c757bed56dd2a8c1125b | |
| parent | d9597b967c6072b86d773b6cc93e47c9084e6229 (diff) | |
| download | kernel-43fbac19f27b01b98972e3cb4876649164ef1b2d.tar.gz kernel-43fbac19f27b01b98972e3cb4876649164ef1b2d.tar.xz kernel-43fbac19f27b01b98972e3cb4876649164ef1b2d.zip | |
Cleanup BLK_DEV_IDE options
We've had CONFIG_IDE disabled for a long time on everything except ppc.
Remove all of the options that depend on it from config-generic and add
whatever is left over to the powerpc config file
| -rw-r--r-- | config-generic | 48 | ||||
| -rw-r--r-- | config-powerpc-generic | 7 |
2 files changed, 7 insertions, 48 deletions
diff --git a/config-generic b/config-generic index 1db37bad1..a08dcd4f1 100644 --- a/config-generic +++ b/config-generic @@ -252,12 +252,8 @@ CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_BLK_DEV_INITRD=y -CONFIG_BLK_DEV_ATIIXP=y CONFIG_BLK_DEV_IO_TRACE=y -CONFIG_BLK_DEV_DELKIN=m -# CONFIG_BLK_DEV_IT8213 is not set -# CONFIG_BLK_DEV_TC86C001 is not set CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y @@ -269,50 +265,6 @@ CONFIG_BLK_DEV_THROTTLING=y # # CONFIG_IDE is not set -# -# Please see Documentation/ide.txt for help/info on IDE drives -# -CONFIG_BLK_DEV_IDECS=m -CONFIG_BLK_DEV_IDECD=m -# CONFIG_BLK_DEV_IDETAPE is not set -CONFIG_IDE_TASK_IOCTL=y -# CONFIG_BLK_DEV_IDE_SATA is not set - -# -# IDE chipset support/bugfixes -# -CONFIG_BLK_DEV_CMD640=y -CONFIG_BLK_DEV_CMD640_ENHANCED=y -CONFIG_BLK_DEV_IDEPCI=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=y -# CONFIG_BLK_DEV_OPTI621 is not set -CONFIG_BLK_DEV_RZ1000=y -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_AEC62XX=y -CONFIG_BLK_DEV_ALI15X3=y -# CONFIG_BLK_DEV_AMD74XX is not set -CONFIG_BLK_DEV_CMD64X=y -CONFIG_BLK_DEV_TRIFLEX=y -# CONFIG_BLK_DEV_CY82C693 is not set -CONFIG_BLK_DEV_CS5520=y -CONFIG_BLK_DEV_CS5530=y -CONFIG_BLK_DEV_CS5535=y -CONFIG_BLK_DEV_HPT366=y -CONFIG_BLK_DEV_IT821X=y -CONFIG_BLK_DEV_JMICRON=y -# CONFIG_BLK_DEV_SC1200 is not set -CONFIG_BLK_DEV_PIIX=y -# CONFIG_BLK_DEV_NS87415 is not set -CONFIG_BLK_DEV_PDC202XX_OLD=y -CONFIG_BLK_DEV_PDC202XX_NEW=y -CONFIG_BLK_DEV_SVWKS=y -CONFIG_BLK_DEV_SIIMAGE=y -CONFIG_BLK_DEV_SIS5513=y -# CONFIG_BLK_DEV_SLC90E66 is not set -# CONFIG_BLK_DEV_TRM290 is not set -CONFIG_BLK_DEV_VIA82CXXX=y -CONFIG_BLK_DEV_IDEDMA=y # CONFIG_BLK_DEV_HD is not set CONFIG_SCSI_VIRTIO=m diff --git a/config-powerpc-generic b/config-powerpc-generic index bd838d374..05f2a9313 100644 --- a/config-powerpc-generic +++ b/config-powerpc-generic @@ -160,7 +160,14 @@ CONFIG_IDE_TASK_IOCTL=y # CONFIG_BLK_DEV_TRM290 is not set # CONFIG_BLK_DEV_VIA82CXXX is not set # CONFIG_BLK_DEV_IDE_PMAC is not set +# CONFIG_BLK_DEV_AMD74XX is not set +# CONFIG_BLK_DEV_OPTI621 is not set +# CONFIG_BLK_DEV_OFFBOARD is not set +CONFIG_BLK_DEV_DELKIN=m +# CONFIG_BLK_DEV_IT8213 is not set +# CONFIG_BLK_DEV_TC86C001 is not set CONFIG_BLK_DEV_IDEDMA=y +CONFIG_BLK_DEV_GENERIC=y # CONFIG_BLK_DEV_HD is not set # CONFIG_USB_STORAGE_ISD200 is not set CONFIG_MTD_PHYSMAP_OF=m |