| Message ID | 20200911102746.1287829-1-hch@lst.de (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | parisc: disable CONFIG_IDE in defconfigs | expand |
On 11.09.20 12:27, Christoph Hellwig wrote: > 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 <hch@lst.de> Acked-by: Helge Deller <deller@gmx.de> Helge > --- > arch/parisc/configs/generic-32bit_defconfig | 6 ++---- > arch/parisc/configs/generic-64bit_defconfig | 6 +----- > 2 files changed, 3 insertions(+), 9 deletions(-) > > diff --git a/arch/parisc/configs/generic-32bit_defconfig b/arch/parisc/configs/generic-32bit_defconfig > index 61bac8ff8f228f..3cbcfad5f7249d 100644 > --- a/arch/parisc/configs/generic-32bit_defconfig > +++ b/arch/parisc/configs/generic-32bit_defconfig > @@ -52,10 +52,6 @@ CONFIG_BLK_DEV_LOOP=y > CONFIG_BLK_DEV_CRYPTOLOOP=y > CONFIG_BLK_DEV_RAM=y > CONFIG_BLK_DEV_RAM_SIZE=6144 > -CONFIG_IDE=y > -CONFIG_BLK_DEV_IDECD=y > -CONFIG_BLK_DEV_GENERIC=y > -CONFIG_BLK_DEV_NS87415=y > CONFIG_BLK_DEV_SD=y > CONFIG_CHR_DEV_ST=y > CONFIG_BLK_DEV_SR=y > @@ -65,6 +61,8 @@ CONFIG_SCSI_SYM53C8XX_2=y > CONFIG_SCSI_ZALON=y > CONFIG_SCSI_DH=y > CONFIG_ATA=y > +CONFIG_ATA_GENERIC=y > +CONFIG_PATA_NS87415=y > CONFIG_MD=y > CONFIG_BLK_DEV_MD=m > CONFIG_MD_LINEAR=m > diff --git a/arch/parisc/configs/generic-64bit_defconfig b/arch/parisc/configs/generic-64bit_defconfig > index 59561e04e6593f..7e2d7026285ec5 100644 > --- a/arch/parisc/configs/generic-64bit_defconfig > +++ b/arch/parisc/configs/generic-64bit_defconfig > @@ -58,11 +58,6 @@ CONFIG_PCI_IOV=y > CONFIG_DEVTMPFS=y > CONFIG_DEVTMPFS_MOUNT=y > CONFIG_BLK_DEV_LOOP=y > -CONFIG_IDE=y > -CONFIG_IDE_GD=m > -CONFIG_IDE_GD_ATAPI=y > -CONFIG_BLK_DEV_IDECD=m > -CONFIG_BLK_DEV_NS87415=y > # CONFIG_SCSI_PROC_FS is not set > CONFIG_BLK_DEV_SD=y > CONFIG_BLK_DEV_SR=y > @@ -76,6 +71,7 @@ CONFIG_SCSI_ZALON=y > CONFIG_SCSI_QLA_ISCSI=m > CONFIG_SCSI_DH=y > CONFIG_ATA=y > +CONFIG_PATA_NS87415=y > CONFIG_PATA_SIL680=y > CONFIG_ATA_GENERIC=y > CONFIG_MD=y >
diff --git a/arch/parisc/configs/generic-32bit_defconfig b/arch/parisc/configs/generic-32bit_defconfig index 61bac8ff8f228f..3cbcfad5f7249d 100644 --- a/arch/parisc/configs/generic-32bit_defconfig +++ b/arch/parisc/configs/generic-32bit_defconfig @@ -52,10 +52,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_CRYPTOLOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=6144 -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_BLK_DEV_GENERIC=y -CONFIG_BLK_DEV_NS87415=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=y CONFIG_BLK_DEV_SR=y @@ -65,6 +61,8 @@ CONFIG_SCSI_SYM53C8XX_2=y CONFIG_SCSI_ZALON=y CONFIG_SCSI_DH=y CONFIG_ATA=y +CONFIG_ATA_GENERIC=y +CONFIG_PATA_NS87415=y CONFIG_MD=y CONFIG_BLK_DEV_MD=m CONFIG_MD_LINEAR=m diff --git a/arch/parisc/configs/generic-64bit_defconfig b/arch/parisc/configs/generic-64bit_defconfig index 59561e04e6593f..7e2d7026285ec5 100644 --- a/arch/parisc/configs/generic-64bit_defconfig +++ b/arch/parisc/configs/generic-64bit_defconfig @@ -58,11 +58,6 @@ CONFIG_PCI_IOV=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_BLK_DEV_LOOP=y -CONFIG_IDE=y -CONFIG_IDE_GD=m -CONFIG_IDE_GD_ATAPI=y -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_NS87415=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SR=y @@ -76,6 +71,7 @@ CONFIG_SCSI_ZALON=y CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_DH=y CONFIG_ATA=y +CONFIG_PATA_NS87415=y CONFIG_PATA_SIL680=y CONFIG_ATA_GENERIC=y CONFIG_MD=y
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 <hch@lst.de> --- arch/parisc/configs/generic-32bit_defconfig | 6 ++---- arch/parisc/configs/generic-64bit_defconfig | 6 +----- 2 files changed, 3 insertions(+), 9 deletions(-)