Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 0b5d9a0

Browse files
Christoph Hellwighdeller
authored andcommitted
parisc: disable CONFIG_IDE in defconfigs
Enable libata support for the Nat Semi NS87415 controller, and disable the soon to be removed legacy ide driver entirely. Signed-off-by: Christoph Hellwig <[email protected]> Acked-by: Helge Deller <[email protected]> Signed-off-by: Helge Deller <[email protected]>
1 parent cd76070 commit 0b5d9a0

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

arch/parisc/configs/generic-32bit_defconfig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ CONFIG_BLK_DEV_LOOP=y
5252
CONFIG_BLK_DEV_CRYPTOLOOP=y
5353
CONFIG_BLK_DEV_RAM=y
5454
CONFIG_BLK_DEV_RAM_SIZE=6144
55-
CONFIG_IDE=y
56-
CONFIG_BLK_DEV_IDECD=y
57-
CONFIG_BLK_DEV_GENERIC=y
58-
CONFIG_BLK_DEV_NS87415=y
5955
CONFIG_BLK_DEV_SD=y
6056
CONFIG_CHR_DEV_ST=y
6157
CONFIG_BLK_DEV_SR=y
@@ -65,6 +61,8 @@ CONFIG_SCSI_SYM53C8XX_2=y
6561
CONFIG_SCSI_ZALON=y
6662
CONFIG_SCSI_DH=y
6763
CONFIG_ATA=y
64+
CONFIG_ATA_GENERIC=y
65+
CONFIG_PATA_NS87415=y
6866
CONFIG_MD=y
6967
CONFIG_BLK_DEV_MD=m
7068
CONFIG_MD_LINEAR=m

arch/parisc/configs/generic-64bit_defconfig

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@ CONFIG_PCI_IOV=y
5858
CONFIG_DEVTMPFS=y
5959
CONFIG_DEVTMPFS_MOUNT=y
6060
CONFIG_BLK_DEV_LOOP=y
61-
CONFIG_IDE=y
62-
CONFIG_IDE_GD=m
63-
CONFIG_IDE_GD_ATAPI=y
64-
CONFIG_BLK_DEV_IDECD=m
65-
CONFIG_BLK_DEV_NS87415=y
6661
# CONFIG_SCSI_PROC_FS is not set
6762
CONFIG_BLK_DEV_SD=y
6863
CONFIG_BLK_DEV_SR=y
@@ -76,6 +71,7 @@ CONFIG_SCSI_ZALON=y
7671
CONFIG_SCSI_QLA_ISCSI=m
7772
CONFIG_SCSI_DH=y
7873
CONFIG_ATA=y
74+
CONFIG_PATA_NS87415=y
7975
CONFIG_PATA_SIL680=y
8076
CONFIG_ATA_GENERIC=y
8177
CONFIG_MD=y

0 commit comments

Comments
 (0)