Skip to content

Commit b7aaf16

Browse files
Christoph HellwigRich Felker
authored andcommitted
sh: remove CONFIG_IDE from most defconfig
Remove CONFIG_IDE from defconfigs that did not actually select chipset drivers, and switch ones that have libata drivers to libata. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Rich Felker <[email protected]>
1 parent a115363 commit b7aaf16

File tree

6 files changed

+6
-18
lines changed

6 files changed

+6
-18
lines changed

arch/sh/configs/landisk_defconfig

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,12 @@ CONFIG_NETFILTER=y
2727
CONFIG_ATALK=m
2828
CONFIG_BLK_DEV_LOOP=y
2929
CONFIG_BLK_DEV_RAM=y
30-
CONFIG_IDE=y
31-
CONFIG_BLK_DEV_IDECD=y
32-
CONFIG_BLK_DEV_OFFBOARD=y
33-
CONFIG_BLK_DEV_GENERIC=y
34-
CONFIG_BLK_DEV_AEC62XX=y
30+
CONFIG_ATA=y
31+
CONFIG_ATA_GENERIC=y
32+
CONFIG_PATA_ATP867X=y
3533
CONFIG_SCSI=y
3634
CONFIG_BLK_DEV_SD=y
35+
CONFIG_BLK_DEV_SR=y
3736
CONFIG_SCSI_MULTI_LUN=y
3837
CONFIG_MD=y
3938
CONFIG_BLK_DEV_MD=m

arch/sh/configs/microdev_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ CONFIG_IP_PNP=y
2020
# CONFIG_IPV6 is not set
2121
# CONFIG_FW_LOADER is not set
2222
CONFIG_BLK_DEV_RAM=y
23-
CONFIG_IDE=y
24-
CONFIG_BLK_DEV_IDECD=y
2523
CONFIG_NETDEVICES=y
2624
CONFIG_NET_ETHERNET=y
2725
CONFIG_SMC91X=y

arch/sh/configs/sdk7780_defconfig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,14 @@ CONFIG_NET_SCHED=y
4444
CONFIG_PARPORT=y
4545
CONFIG_BLK_DEV_LOOP=y
4646
CONFIG_BLK_DEV_RAM=y
47-
CONFIG_IDE=y
48-
CONFIG_BLK_DEV_IDECD=y
49-
CONFIG_BLK_DEV_PLATFORM=y
50-
CONFIG_BLK_DEV_GENERIC=y
5147
CONFIG_BLK_DEV_SD=y
5248
CONFIG_BLK_DEV_SR=y
5349
CONFIG_CHR_DEV_SG=y
5450
CONFIG_SCSI_SPI_ATTRS=y
5551
CONFIG_SCSI_FC_ATTRS=y
5652
CONFIG_ATA=y
53+
CONFIG_ATA_GENERIC=y
54+
CONFIG_PATA_PLATFORM=y
5755
CONFIG_MD=y
5856
CONFIG_BLK_DEV_DM=y
5957
CONFIG_NETDEVICES=y

arch/sh/configs/sdk7786_defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,6 @@ CONFIG_MTD_UBI_GLUEBI=m
116116
CONFIG_BLK_DEV_LOOP=y
117117
CONFIG_BLK_DEV_CRYPTOLOOP=y
118118
CONFIG_BLK_DEV_RAM=y
119-
CONFIG_IDE=y
120-
CONFIG_BLK_DEV_IDECD=y
121-
CONFIG_BLK_DEV_PLATFORM=y
122119
CONFIG_BLK_DEV_SD=y
123120
CONFIG_BLK_DEV_SR=y
124121
CONFIG_SCSI_MULTI_LUN=y

arch/sh/configs/se7750_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ CONFIG_MTD_BLOCK=y
2929
CONFIG_MTD_CFI=y
3030
CONFIG_MTD_CFI_AMDSTD=y
3131
CONFIG_MTD_ROM=y
32-
CONFIG_IDE=y
3332
CONFIG_SCSI=y
3433
CONFIG_NETDEVICES=y
3534
CONFIG_NET_ETHERNET=y

arch/sh/configs/sh03_defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ CONFIG_IP_PNP_RARP=y
3939
CONFIG_BLK_DEV_LOOP=y
4040
CONFIG_BLK_DEV_NBD=y
4141
CONFIG_BLK_DEV_RAM=y
42-
CONFIG_IDE=y
43-
CONFIG_BLK_DEV_IDECD=m
44-
CONFIG_BLK_DEV_IDETAPE=m
4542
CONFIG_SCSI=m
4643
CONFIG_BLK_DEV_SD=m
4744
CONFIG_BLK_DEV_SR=m

0 commit comments

Comments
 (0)