From 9e41e4a5be6e693f0e8f7e4acc3bb656514e059a Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 2 Sep 2013 03:20:38 +0000 Subject: [PATCH] Disable parport drivers that are no longer likely to be useful svn path=/dists/trunk/linux/; revision=20558 --- debian/changelog | 5 ++++ debian/config/alpha/config | 25 ------------------- debian/config/armel/config.ixp4xx | 2 -- debian/config/armel/config.kirkwood | 2 -- debian/config/armel/config.mv78xx0 | 2 -- debian/config/armel/config.orion5x | 2 -- debian/config/config | 12 +++++---- debian/config/hppa/config | 3 --- debian/config/kernelarch-x86/config | 27 +-------------------- debian/config/kernelarch-x86/config-arch-32 | 5 ---- debian/config/m68k/config | 1 - debian/config/mips/config.4kc-malta | 25 ------------------- debian/config/mips/config.5kc-malta | 25 ------------------- debian/config/mipsel/config.r5k-cobalt | 1 - debian/config/sparc/config | 1 - 15 files changed, 13 insertions(+), 125 deletions(-) diff --git a/debian/changelog b/debian/changelog index ccad14afd..8b1086127 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,11 @@ linux (3.11~rc7-1~exp2) UNRELEASED; urgency=low - SCSI: Disable SCSI_AIC7XXX_OLD - [x86] mtd: Disable MTD_PMC551 - [x86] net/wan: Disable SBNI + * Disable parport drivers that are no longer likely to be useful: + - block: Disable PARIDE + - media: Disable VIDEO_BWQCAM, VIDEO_CQCAM, VIDEO_W9966 + - SCSI: Disable SCSI_IMM, SCSI_PPA + - [x86] net/ethernet: Disable ATP -- Ben Hutchings Sun, 01 Sep 2013 18:45:47 +0100 diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 2a952516a..6fceaf759 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -127,7 +127,6 @@ CONFIG_ATM_HE_USE_SUNI=y ## file: drivers/block/Kconfig ## CONFIG_BLK_DEV_FD=m -CONFIG_PARIDE=m CONFIG_BLK_CPQ_DA=m CONFIG_BLK_CPQ_CISS_DA=m CONFIG_CISS_SCSI_TAPE=y @@ -139,30 +138,6 @@ CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD_WCACHE=y -## -## file: drivers/block/paride/Kconfig -## -CONFIG_PARIDE_PD=m -CONFIG_PARIDE_PCD=m -CONFIG_PARIDE_PF=m -CONFIG_PARIDE_PT=m -CONFIG_PARIDE_PG=m -CONFIG_PARIDE_ATEN=m -CONFIG_PARIDE_BPCK=m -CONFIG_PARIDE_COMM=m -CONFIG_PARIDE_DSTR=m -CONFIG_PARIDE_FIT2=m -CONFIG_PARIDE_FIT3=m -CONFIG_PARIDE_EPAT=m -CONFIG_PARIDE_EPATC8=y -CONFIG_PARIDE_EPIA=m -CONFIG_PARIDE_FRIQ=m -CONFIG_PARIDE_FRPW=m -CONFIG_PARIDE_KBIC=m -CONFIG_PARIDE_KTTI=m -CONFIG_PARIDE_ON20=m -CONFIG_PARIDE_ON26=m - ## ## file: drivers/bluetooth/Kconfig ## diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index 2b105ddce..5a7ffd351 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -558,8 +558,6 @@ CONFIG_RTC_DRV_PCF8563=y # CONFIG_SCSI_IPS is not set # CONFIG_SCSI_INITIO is not set # CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_PPA is not set -# CONFIG_SCSI_IMM is not set # CONFIG_SCSI_STEX is not set # CONFIG_SCSI_SYM53C8XX_2 is not set # CONFIG_SCSI_QLOGIC_1280 is not set diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index f5230956e..31d5c4b85 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -528,8 +528,6 @@ CONFIG_RTC_DRV_MV=y # CONFIG_SCSI_IPS is not set # CONFIG_SCSI_INITIO is not set # CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_PPA is not set -# CONFIG_SCSI_IMM is not set # CONFIG_SCSI_STEX is not set # CONFIG_SCSI_SYM53C8XX_2 is not set # CONFIG_SCSI_IPR is not set diff --git a/debian/config/armel/config.mv78xx0 b/debian/config/armel/config.mv78xx0 index 6b27795e6..8d8833168 100644 --- a/debian/config/armel/config.mv78xx0 +++ b/debian/config/armel/config.mv78xx0 @@ -446,8 +446,6 @@ CONFIG_RTC_DRV_S35390A=y # CONFIG_SCSI_IPS is not set # CONFIG_SCSI_INITIO is not set # CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_PPA is not set -# CONFIG_SCSI_IMM is not set # CONFIG_SCSI_STEX is not set # CONFIG_SCSI_SYM53C8XX_2 is not set # CONFIG_SCSI_IPR is not set diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index 295bf976d..a8ed9b271 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -465,8 +465,6 @@ CONFIG_RTC_DRV_S35390A=y # CONFIG_SCSI_IPS is not set # CONFIG_SCSI_INITIO is not set # CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_PPA is not set -# CONFIG_SCSI_IMM is not set # CONFIG_SCSI_STEX is not set # CONFIG_SCSI_SYM53C8XX_2 is not set # CONFIG_SCSI_IPR is not set diff --git a/debian/config/config b/debian/config/config index 397b10cb2..6d7b00e3e 100644 --- a/debian/config/config +++ b/debian/config/config @@ -246,6 +246,7 @@ CONFIG_BCMA_HOST_PCI=y ## file: drivers/block/Kconfig ## CONFIG_BLK_DEV=y +# CONFIG_PARIDE is not set CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_CRYPTOLOOP is not set @@ -1302,11 +1303,12 @@ CONFIG_SMS_SDIO_DRV=m ## ## file: drivers/media/parport/Kconfig ## +#. Actually VIDEO_PMS is an ISA driver CONFIG_MEDIA_PARPORT_SUPPORT=y -CONFIG_VIDEO_BWQCAM=m -CONFIG_VIDEO_CQCAM=m +# CONFIG_VIDEO_BWQCAM is not set +# CONFIG_VIDEO_CQCAM is not set CONFIG_VIDEO_PMS=m -CONFIG_VIDEO_W9966=m +# CONFIG_VIDEO_W9966 is not set ## ## file: drivers/media/pci/Kconfig @@ -3064,8 +3066,8 @@ CONFIG_VMWARE_PVSCSI=m CONFIG_LIBFC=m CONFIG_FCOE=m CONFIG_FCOE_FNIC=m -CONFIG_SCSI_PPA=m -CONFIG_SCSI_IMM=m +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_IMM is not set # CONFIG_SCSI_IZIP_EPP16 is not set # CONFIG_SCSI_IZIP_SLOW_CTR is not set CONFIG_SCSI_STEX=m diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 260b7308b..49b29a18d 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -37,7 +37,6 @@ CONFIG_PATA_LEGACY=m ## file: drivers/block/Kconfig ## # CONFIG_BLK_DEV_FD is not set -# CONFIG_PARIDE is not set # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set @@ -463,8 +462,6 @@ CONFIG_I82365=m # CONFIG_SCSI_IPS is not set CONFIG_SCSI_INITIO=m # CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_PPA is not set -# CONFIG_SCSI_IMM is not set # CONFIG_SCSI_NCR53C406A is not set CONFIG_SCSI_LASI700=m CONFIG_SCSI_SYM53C8XX_2=m diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 7328a6dba..d251b068f 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -237,7 +237,6 @@ CONFIG_KS0108_DELAY=2 ## file: drivers/block/Kconfig ## CONFIG_BLK_DEV_FD=m -CONFIG_PARIDE=m CONFIG_BLK_CPQ_DA=m CONFIG_BLK_CPQ_CISS_DA=m CONFIG_CISS_SCSI_TAPE=y @@ -248,30 +247,6 @@ CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set -## -## file: drivers/block/paride/Kconfig -## -CONFIG_PARIDE_PD=m -CONFIG_PARIDE_PCD=m -CONFIG_PARIDE_PF=m -CONFIG_PARIDE_PT=m -CONFIG_PARIDE_PG=m -CONFIG_PARIDE_ATEN=m -CONFIG_PARIDE_BPCK=m -CONFIG_PARIDE_COMM=m -CONFIG_PARIDE_DSTR=m -CONFIG_PARIDE_FIT2=m -CONFIG_PARIDE_FIT3=m -CONFIG_PARIDE_EPAT=m -# CONFIG_PARIDE_EPATC8 is not set -CONFIG_PARIDE_EPIA=m -CONFIG_PARIDE_FRIQ=m -CONFIG_PARIDE_FRPW=m -CONFIG_PARIDE_KBIC=m -CONFIG_PARIDE_KTTI=m -CONFIG_PARIDE_ON20=m -CONFIG_PARIDE_ON26=m - ## ## file: drivers/bluetooth/Kconfig ## @@ -985,7 +960,7 @@ CONFIG_PCH_GBE=m ## file: drivers/net/ethernet/realtek/Kconfig ## CONFIG_NET_VENDOR_REALTEK=y -CONFIG_ATP=m +# CONFIG_ATP is not set CONFIG_8139CP=m CONFIG_8139TOO=m CONFIG_8139TOO_TUNE_TWISTER=y diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32 index 0ede12cae..7d19b0ab6 100644 --- a/debian/config/kernelarch-x86/config-arch-32 +++ b/debian/config/kernelarch-x86/config-arch-32 @@ -89,11 +89,6 @@ CONFIG_CFAG12864B_RATE=20 ## CONFIG_BLK_DEV_RAM_SIZE=8192 -## -## file: drivers/block/paride/Kconfig -## -CONFIG_PARIDE_BPCK6=m - ## ## file: drivers/char/Kconfig ## diff --git a/debian/config/m68k/config b/debian/config/m68k/config index decc9f5f2..4aec9e838 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -93,7 +93,6 @@ CONFIG_AMIGA_FLOPPY=m CONFIG_ATARI_FLOPPY=m CONFIG_BLK_DEV_SWIM=m CONFIG_AMIGA_Z2RAM=y -# CONFIG_PARIDE is not set CONFIG_CDROM_PKTCDVD=m # CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_RBD is not set diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index e960a17b4..8632af3e7 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -140,7 +140,6 @@ CONFIG_ATA_GENERIC=y ## file: drivers/block/Kconfig ## CONFIG_BLK_DEV_FD=m -CONFIG_PARIDE=m # CONFIG_BLK_CPQ_DA is not set CONFIG_BLK_CPQ_CISS_DA=m CONFIG_CISS_SCSI_TAPE=y @@ -152,30 +151,6 @@ CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set -## -## file: drivers/block/paride/Kconfig -## -CONFIG_PARIDE_PD=m -CONFIG_PARIDE_PCD=m -CONFIG_PARIDE_PF=m -CONFIG_PARIDE_PT=m -CONFIG_PARIDE_PG=m -CONFIG_PARIDE_ATEN=m -CONFIG_PARIDE_BPCK=m -CONFIG_PARIDE_COMM=m -CONFIG_PARIDE_DSTR=m -CONFIG_PARIDE_FIT2=m -CONFIG_PARIDE_FIT3=m -CONFIG_PARIDE_EPAT=m -# CONFIG_PARIDE_EPATC8 is not set -CONFIG_PARIDE_EPIA=m -CONFIG_PARIDE_FRIQ=m -CONFIG_PARIDE_FRPW=m -CONFIG_PARIDE_KBIC=m -CONFIG_PARIDE_KTTI=m -CONFIG_PARIDE_ON20=m -CONFIG_PARIDE_ON26=m - ## ## file: drivers/bluetooth/Kconfig ## diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index c015703f1..53c9efeb9 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -143,7 +143,6 @@ CONFIG_ATA_GENERIC=y ## file: drivers/block/Kconfig ## CONFIG_BLK_DEV_FD=m -CONFIG_PARIDE=m # CONFIG_BLK_CPQ_DA is not set CONFIG_BLK_CPQ_CISS_DA=m CONFIG_CISS_SCSI_TAPE=y @@ -155,30 +154,6 @@ CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set -## -## file: drivers/block/paride/Kconfig -## -CONFIG_PARIDE_PD=m -CONFIG_PARIDE_PCD=m -CONFIG_PARIDE_PF=m -CONFIG_PARIDE_PT=m -CONFIG_PARIDE_PG=m -CONFIG_PARIDE_ATEN=m -CONFIG_PARIDE_BPCK=m -CONFIG_PARIDE_COMM=m -CONFIG_PARIDE_DSTR=m -CONFIG_PARIDE_FIT2=m -CONFIG_PARIDE_FIT3=m -CONFIG_PARIDE_EPAT=m -# CONFIG_PARIDE_EPATC8 is not set -CONFIG_PARIDE_EPIA=m -CONFIG_PARIDE_FRIQ=m -CONFIG_PARIDE_FRPW=m -CONFIG_PARIDE_KBIC=m -CONFIG_PARIDE_KTTI=m -CONFIG_PARIDE_ON20=m -CONFIG_PARIDE_ON26=m - ## ## file: drivers/bluetooth/Kconfig ## diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 7d30609ad..0be4104ee 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -95,7 +95,6 @@ CONFIG_PATA_PLATFORM=y ## ## file: drivers/block/Kconfig ## -# CONFIG_PARIDE is not set # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 1d6be677c..1241932ff 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -33,7 +33,6 @@ CONFIG_PATA_LEGACY=m ## file: drivers/block/Kconfig ## CONFIG_BLK_DEV_FD=y -# CONFIG_PARIDE is not set # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set