aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBart Van Assche <bvanassche@acm.org>2014-04-15 06:26:53 -0400
committerChristoph Hellwig <hch@lst.de>2014-07-17 16:07:44 -0400
commitaa3fc09078da889d5ffc7ed2745760ce04bf7384 (patch)
treebb8f9157902bbb95ebd195c4a4724a679fc5beda /arch
parent066465251303c2a4ba489596f1ecda279711273d (diff)
tgt: defconfig cleanup
Because of the removal of the scsi_tgt kernel module, the kbuild variables CONFIG_SCSI_TGT, CONFIG_SCSI_SRP_TGT_ATTRS and CONFIG_SCSI_FC_TGT_ATTRS are obsolete. This patch removes these variables. This patch is the result of the following command: find -name '*defconfig' | while read f; do grep -vwE 'CONFIG_SCSI_TGT|CONFIG_SCSI_SRP_TGT_ATTRS|CONFIG_SCSI_FC_TGT_ATTRS|CONFIG_SRP' $f >/tmp/t && mv /tmp/t $f; done Signed-off-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Hannes Reinecke <hare@suse.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/msm_defconfig1
-rw-r--r--arch/arm/configs/s3c2410_defconfig1
-rw-r--r--arch/m68k/configs/amiga_defconfig1
-rw-r--r--arch/m68k/configs/apollo_defconfig1
-rw-r--r--arch/m68k/configs/atari_defconfig1
-rw-r--r--arch/m68k/configs/bvme6000_defconfig1
-rw-r--r--arch/m68k/configs/hp300_defconfig1
-rw-r--r--arch/m68k/configs/mac_defconfig1
-rw-r--r--arch/m68k/configs/multi_defconfig1
-rw-r--r--arch/m68k/configs/mvme147_defconfig1
-rw-r--r--arch/m68k/configs/mvme16x_defconfig1
-rw-r--r--arch/m68k/configs/q40_defconfig1
-rw-r--r--arch/m68k/configs/sun3_defconfig1
-rw-r--r--arch/m68k/configs/sun3x_defconfig1
-rw-r--r--arch/mips/configs/db1xxx_defconfig1
-rw-r--r--arch/mips/configs/decstation_defconfig1
-rw-r--r--arch/mips/configs/ip22_defconfig1
-rw-r--r--arch/mips/configs/ip27_defconfig1
-rw-r--r--arch/mips/configs/ip32_defconfig1
-rw-r--r--arch/mips/configs/jazz_defconfig1
-rw-r--r--arch/mips/configs/loongson3_defconfig1
-rw-r--r--arch/mips/configs/malta_defconfig1
-rw-r--r--arch/mips/configs/malta_kvm_defconfig1
-rw-r--r--arch/mips/configs/malta_kvm_guest_defconfig1
-rw-r--r--arch/mips/configs/markeins_defconfig1
-rw-r--r--arch/mips/configs/nlm_xlp_defconfig3
-rw-r--r--arch/mips/configs/nlm_xlr_defconfig3
-rw-r--r--arch/mips/configs/rm200_defconfig1
-rw-r--r--arch/mips/configs/tb0226_defconfig1
-rw-r--r--arch/mips/configs/tb0287_defconfig1
-rw-r--r--arch/powerpc/configs/52xx/motionpro_defconfig1
-rw-r--r--arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig1
-rw-r--r--arch/powerpc/configs/mpc5200_defconfig1
-rw-r--r--arch/powerpc/configs/ppc6xx_defconfig2
-rw-r--r--arch/s390/configs/default_defconfig2
-rw-r--r--arch/s390/configs/gcov_defconfig2
-rw-r--r--arch/s390/configs/performance_defconfig2
-rw-r--r--arch/sh/configs/sh2007_defconfig1
-rw-r--r--arch/tile/configs/tilegx_defconfig1
-rw-r--r--arch/tile/configs/tilepro_defconfig1
40 files changed, 0 insertions, 48 deletions
diff --git a/arch/arm/configs/msm_defconfig b/arch/arm/configs/msm_defconfig
index 7f52dad97f51..dd18c9e527d6 100644
--- a/arch/arm/configs/msm_defconfig
+++ b/arch/arm/configs/msm_defconfig
@@ -45,7 +45,6 @@ CONFIG_RFKILL=y
45CONFIG_BLK_DEV_LOOP=y 45CONFIG_BLK_DEV_LOOP=y
46CONFIG_BLK_DEV_RAM=y 46CONFIG_BLK_DEV_RAM=y
47CONFIG_SCSI=y 47CONFIG_SCSI=y
48CONFIG_SCSI_TGT=y
49CONFIG_BLK_DEV_SD=y 48CONFIG_BLK_DEV_SD=y
50CONFIG_CHR_DEV_SG=y 49CONFIG_CHR_DEV_SG=y
51CONFIG_CHR_DEV_SCH=y 50CONFIG_CHR_DEV_SCH=y
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig
index eb4d204bff47..f3142369f594 100644
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
@@ -225,7 +225,6 @@ CONFIG_BLK_DEV_IDECD=y
225CONFIG_BLK_DEV_IDETAPE=m 225CONFIG_BLK_DEV_IDETAPE=m
226CONFIG_BLK_DEV_PLATFORM=y 226CONFIG_BLK_DEV_PLATFORM=y
227CONFIG_SCSI=y 227CONFIG_SCSI=y
228CONFIG_SCSI_TGT=m
229CONFIG_BLK_DEV_SD=y 228CONFIG_BLK_DEV_SD=y
230CONFIG_CHR_DEV_ST=m 229CONFIG_CHR_DEV_ST=m
231CONFIG_BLK_DEV_SR=m 230CONFIG_BLK_DEV_SR=m
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index d7eac833a94f..399df883c8bb 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -257,7 +257,6 @@ CONFIG_BLK_DEV_GAYLE=y
257CONFIG_BLK_DEV_BUDDHA=y 257CONFIG_BLK_DEV_BUDDHA=y
258CONFIG_RAID_ATTRS=m 258CONFIG_RAID_ATTRS=m
259CONFIG_SCSI=y 259CONFIG_SCSI=y
260CONFIG_SCSI_TGT=m
261CONFIG_BLK_DEV_SD=y 260CONFIG_BLK_DEV_SD=y
262CONFIG_CHR_DEV_ST=m 261CONFIG_CHR_DEV_ST=m
263CONFIG_CHR_DEV_OSST=m 262CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index 650ee75de6cd..be16740c0749 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -244,7 +244,6 @@ CONFIG_ATA_OVER_ETH=m
244CONFIG_DUMMY_IRQ=m 244CONFIG_DUMMY_IRQ=m
245CONFIG_RAID_ATTRS=m 245CONFIG_RAID_ATTRS=m
246CONFIG_SCSI=y 246CONFIG_SCSI=y
247CONFIG_SCSI_TGT=m
248CONFIG_BLK_DEV_SD=y 247CONFIG_BLK_DEV_SD=y
249CONFIG_CHR_DEV_ST=m 248CONFIG_CHR_DEV_ST=m
250CONFIG_CHR_DEV_OSST=m 249CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index 3142e69342fa..391e185d73be 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -251,7 +251,6 @@ CONFIG_BLK_DEV_IDECD=y
251CONFIG_BLK_DEV_FALCON_IDE=y 251CONFIG_BLK_DEV_FALCON_IDE=y
252CONFIG_RAID_ATTRS=m 252CONFIG_RAID_ATTRS=m
253CONFIG_SCSI=y 253CONFIG_SCSI=y
254CONFIG_SCSI_TGT=m
255CONFIG_BLK_DEV_SD=y 254CONFIG_BLK_DEV_SD=y
256CONFIG_CHR_DEV_ST=m 255CONFIG_CHR_DEV_ST=m
257CONFIG_CHR_DEV_OSST=m 256CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index 0daa8a172f30..d0e705d1a063 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -242,7 +242,6 @@ CONFIG_ATA_OVER_ETH=m
242CONFIG_DUMMY_IRQ=m 242CONFIG_DUMMY_IRQ=m
243CONFIG_RAID_ATTRS=m 243CONFIG_RAID_ATTRS=m
244CONFIG_SCSI=y 244CONFIG_SCSI=y
245CONFIG_SCSI_TGT=m
246CONFIG_BLK_DEV_SD=y 245CONFIG_BLK_DEV_SD=y
247CONFIG_CHR_DEV_ST=m 246CONFIG_CHR_DEV_ST=m
248CONFIG_CHR_DEV_OSST=m 247CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 88af78f7bad9..fdc7e9672249 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -244,7 +244,6 @@ CONFIG_ATA_OVER_ETH=m
244CONFIG_DUMMY_IRQ=m 244CONFIG_DUMMY_IRQ=m
245CONFIG_RAID_ATTRS=m 245CONFIG_RAID_ATTRS=m
246CONFIG_SCSI=y 246CONFIG_SCSI=y
247CONFIG_SCSI_TGT=m
248CONFIG_BLK_DEV_SD=y 247CONFIG_BLK_DEV_SD=y
249CONFIG_CHR_DEV_ST=m 248CONFIG_CHR_DEV_ST=m
250CONFIG_CHR_DEV_OSST=m 249CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 66f915574a85..3d345641d5a0 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -251,7 +251,6 @@ CONFIG_BLK_DEV_IDECD=y
251CONFIG_BLK_DEV_MAC_IDE=y 251CONFIG_BLK_DEV_MAC_IDE=y
252CONFIG_RAID_ATTRS=m 252CONFIG_RAID_ATTRS=m
253CONFIG_SCSI=y 253CONFIG_SCSI=y
254CONFIG_SCSI_TGT=m
255CONFIG_BLK_DEV_SD=y 254CONFIG_BLK_DEV_SD=y
256CONFIG_CHR_DEV_ST=m 255CONFIG_CHR_DEV_ST=m
257CONFIG_CHR_DEV_OSST=m 256CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 5eaa49924fa6..59aa42096000 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -273,7 +273,6 @@ CONFIG_BLK_DEV_MAC_IDE=y
273CONFIG_BLK_DEV_Q40IDE=y 273CONFIG_BLK_DEV_Q40IDE=y
274CONFIG_RAID_ATTRS=m 274CONFIG_RAID_ATTRS=m
275CONFIG_SCSI=y 275CONFIG_SCSI=y
276CONFIG_SCSI_TGT=m
277CONFIG_BLK_DEV_SD=y 276CONFIG_BLK_DEV_SD=y
278CONFIG_CHR_DEV_ST=m 277CONFIG_CHR_DEV_ST=m
279CONFIG_CHR_DEV_OSST=m 278CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index 324d0b4d8351..066b24af095e 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -241,7 +241,6 @@ CONFIG_ATA_OVER_ETH=m
241CONFIG_DUMMY_IRQ=m 241CONFIG_DUMMY_IRQ=m
242CONFIG_RAID_ATTRS=m 242CONFIG_RAID_ATTRS=m
243CONFIG_SCSI=y 243CONFIG_SCSI=y
244CONFIG_SCSI_TGT=m
245CONFIG_BLK_DEV_SD=y 244CONFIG_BLK_DEV_SD=y
246CONFIG_CHR_DEV_ST=m 245CONFIG_CHR_DEV_ST=m
247CONFIG_CHR_DEV_OSST=m 246CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index f0cb4338952e..9326ea664a5b 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -242,7 +242,6 @@ CONFIG_ATA_OVER_ETH=m
242CONFIG_DUMMY_IRQ=m 242CONFIG_DUMMY_IRQ=m
243CONFIG_RAID_ATTRS=m 243CONFIG_RAID_ATTRS=m
244CONFIG_SCSI=y 244CONFIG_SCSI=y
245CONFIG_SCSI_TGT=m
246CONFIG_BLK_DEV_SD=y 245CONFIG_BLK_DEV_SD=y
247CONFIG_CHR_DEV_ST=m 246CONFIG_CHR_DEV_ST=m
248CONFIG_CHR_DEV_OSST=m 247CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index d6cf0880c463..d7d1101e31b5 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -249,7 +249,6 @@ CONFIG_BLK_DEV_IDECD=y
249CONFIG_BLK_DEV_Q40IDE=y 249CONFIG_BLK_DEV_Q40IDE=y
250CONFIG_RAID_ATTRS=m 250CONFIG_RAID_ATTRS=m
251CONFIG_SCSI=y 251CONFIG_SCSI=y
252CONFIG_SCSI_TGT=m
253CONFIG_BLK_DEV_SD=y 252CONFIG_BLK_DEV_SD=y
254CONFIG_CHR_DEV_ST=m 253CONFIG_CHR_DEV_ST=m
255CONFIG_CHR_DEV_OSST=m 254CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index f4e88d1c7472..98522e8fb852 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -239,7 +239,6 @@ CONFIG_ATA_OVER_ETH=m
239CONFIG_DUMMY_IRQ=m 239CONFIG_DUMMY_IRQ=m
240CONFIG_RAID_ATTRS=m 240CONFIG_RAID_ATTRS=m
241CONFIG_SCSI=y 241CONFIG_SCSI=y
242CONFIG_SCSI_TGT=m
243CONFIG_BLK_DEV_SD=y 242CONFIG_BLK_DEV_SD=y
244CONFIG_CHR_DEV_ST=m 243CONFIG_CHR_DEV_ST=m
245CONFIG_CHR_DEV_OSST=m 244CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index 49f4032c1ad6..5128a8c3f4e3 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -239,7 +239,6 @@ CONFIG_ATA_OVER_ETH=m
239CONFIG_DUMMY_IRQ=m 239CONFIG_DUMMY_IRQ=m
240CONFIG_RAID_ATTRS=m 240CONFIG_RAID_ATTRS=m
241CONFIG_SCSI=y 241CONFIG_SCSI=y
242CONFIG_SCSI_TGT=m
243CONFIG_BLK_DEV_SD=y 242CONFIG_BLK_DEV_SD=y
244CONFIG_CHR_DEV_ST=m 243CONFIG_CHR_DEV_ST=m
245CONFIG_CHR_DEV_OSST=m 244CONFIG_CHR_DEV_OSST=m
diff --git a/arch/mips/configs/db1xxx_defconfig b/arch/mips/configs/db1xxx_defconfig
index a64b30b96a0d..46e8f7676a15 100644
--- a/arch/mips/configs/db1xxx_defconfig
+++ b/arch/mips/configs/db1xxx_defconfig
@@ -116,7 +116,6 @@ CONFIG_MTD_NAND_PLATFORM=y
116CONFIG_MTD_SPI_NOR=y 116CONFIG_MTD_SPI_NOR=y
117CONFIG_EEPROM_AT24=y 117CONFIG_EEPROM_AT24=y
118CONFIG_EEPROM_AT25=y 118CONFIG_EEPROM_AT25=y
119CONFIG_SCSI_TGT=y
120CONFIG_BLK_DEV_SD=y 119CONFIG_BLK_DEV_SD=y
121CONFIG_CHR_DEV_SG=y 120CONFIG_CHR_DEV_SG=y
122CONFIG_SCSI_MULTI_LUN=y 121CONFIG_SCSI_MULTI_LUN=y
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig
index 87d0340837aa..ebc011c51e5a 100644
--- a/arch/mips/configs/decstation_defconfig
+++ b/arch/mips/configs/decstation_defconfig
@@ -45,7 +45,6 @@ CONFIG_VLAN_8021Q=m
45CONFIG_CONNECTOR=m 45CONFIG_CONNECTOR=m
46CONFIG_BLK_DEV_LOOP=m 46CONFIG_BLK_DEV_LOOP=m
47CONFIG_SCSI=y 47CONFIG_SCSI=y
48CONFIG_SCSI_TGT=m
49CONFIG_BLK_DEV_SD=y 48CONFIG_BLK_DEV_SD=y
50CONFIG_CHR_DEV_ST=m 49CONFIG_CHR_DEV_ST=m
51CONFIG_BLK_DEV_SR=m 50CONFIG_BLK_DEV_SR=m
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index 936ec5a5ed8d..57ed466e00db 100644
--- a/arch/mips/configs/ip22_defconfig
+++ b/arch/mips/configs/ip22_defconfig
@@ -219,7 +219,6 @@ CONFIG_ATA_OVER_ETH=m
219# CONFIG_MISC_DEVICES is not set 219# CONFIG_MISC_DEVICES is not set
220CONFIG_RAID_ATTRS=m 220CONFIG_RAID_ATTRS=m
221CONFIG_SCSI=y 221CONFIG_SCSI=y
222CONFIG_SCSI_TGT=m
223CONFIG_BLK_DEV_SD=y 222CONFIG_BLK_DEV_SD=y
224CONFIG_CHR_DEV_ST=y 223CONFIG_CHR_DEV_ST=y
225CONFIG_BLK_DEV_SR=y 224CONFIG_BLK_DEV_SR=y
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index 0e36abcd39cc..cc0756021398 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -106,7 +106,6 @@ CONFIG_CDROM_PKTCDVD=m
106CONFIG_ATA_OVER_ETH=m 106CONFIG_ATA_OVER_ETH=m
107# CONFIG_MISC_DEVICES is not set 107# CONFIG_MISC_DEVICES is not set
108CONFIG_SCSI=y 108CONFIG_SCSI=y
109CONFIG_SCSI_TGT=m
110CONFIG_BLK_DEV_SD=y 109CONFIG_BLK_DEV_SD=y
111CONFIG_CHR_DEV_ST=y 110CONFIG_CHR_DEV_ST=y
112CONFIG_BLK_DEV_SR=m 111CONFIG_BLK_DEV_SR=m
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig
index 7bbd52194fc3..70ffe9b55829 100644
--- a/arch/mips/configs/ip32_defconfig
+++ b/arch/mips/configs/ip32_defconfig
@@ -54,7 +54,6 @@ CONFIG_BLK_DEV_NBD=m
54CONFIG_SGI_IOC4=y 54CONFIG_SGI_IOC4=y
55CONFIG_RAID_ATTRS=y 55CONFIG_RAID_ATTRS=y
56CONFIG_SCSI=y 56CONFIG_SCSI=y
57CONFIG_SCSI_TGT=y
58CONFIG_BLK_DEV_SD=y 57CONFIG_BLK_DEV_SD=y
59CONFIG_BLK_DEV_SR=y 58CONFIG_BLK_DEV_SR=y
60CONFIG_BLK_DEV_SR_VENDOR=y 59CONFIG_BLK_DEV_SR_VENDOR=y
diff --git a/arch/mips/configs/jazz_defconfig b/arch/mips/configs/jazz_defconfig
index 0315ee37a20b..2575302aa2be 100644
--- a/arch/mips/configs/jazz_defconfig
+++ b/arch/mips/configs/jazz_defconfig
@@ -208,7 +208,6 @@ CONFIG_CDROM_PKTCDVD=m
208CONFIG_ATA_OVER_ETH=m 208CONFIG_ATA_OVER_ETH=m
209CONFIG_RAID_ATTRS=m 209CONFIG_RAID_ATTRS=m
210CONFIG_SCSI=y 210CONFIG_SCSI=y
211CONFIG_SCSI_TGT=m
212CONFIG_BLK_DEV_SD=y 211CONFIG_BLK_DEV_SD=y
213CONFIG_CHR_DEV_ST=m 212CONFIG_CHR_DEV_ST=m
214CONFIG_BLK_DEV_SR=m 213CONFIG_BLK_DEV_SR=m
diff --git a/arch/mips/configs/loongson3_defconfig b/arch/mips/configs/loongson3_defconfig
index ea1761f0f917..fca91a8c8ef4 100644
--- a/arch/mips/configs/loongson3_defconfig
+++ b/arch/mips/configs/loongson3_defconfig
@@ -120,7 +120,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=y
120CONFIG_BLK_DEV_RAM=y 120CONFIG_BLK_DEV_RAM=y
121CONFIG_BLK_DEV_RAM_SIZE=8192 121CONFIG_BLK_DEV_RAM_SIZE=8192
122CONFIG_RAID_ATTRS=m 122CONFIG_RAID_ATTRS=m
123CONFIG_SCSI_TGT=y
124CONFIG_BLK_DEV_SD=y 123CONFIG_BLK_DEV_SD=y
125CONFIG_BLK_DEV_SR=y 124CONFIG_BLK_DEV_SR=y
126CONFIG_CHR_DEV_SG=y 125CONFIG_CHR_DEV_SG=y
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index b745b6a9f322..e18741ea1771 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -253,7 +253,6 @@ CONFIG_BLK_DEV_IT8213=m
253CONFIG_BLK_DEV_TC86C001=m 253CONFIG_BLK_DEV_TC86C001=m
254CONFIG_RAID_ATTRS=m 254CONFIG_RAID_ATTRS=m
255CONFIG_SCSI=m 255CONFIG_SCSI=m
256CONFIG_SCSI_TGT=m
257CONFIG_BLK_DEV_SD=m 256CONFIG_BLK_DEV_SD=m
258CONFIG_CHR_DEV_ST=m 257CONFIG_CHR_DEV_ST=m
259CONFIG_CHR_DEV_OSST=m 258CONFIG_CHR_DEV_OSST=m
diff --git a/arch/mips/configs/malta_kvm_defconfig b/arch/mips/configs/malta_kvm_defconfig
index 4f7d952d8517..cf0e01f814e1 100644
--- a/arch/mips/configs/malta_kvm_defconfig
+++ b/arch/mips/configs/malta_kvm_defconfig
@@ -254,7 +254,6 @@ CONFIG_BLK_DEV_IT8213=m
254CONFIG_BLK_DEV_TC86C001=m 254CONFIG_BLK_DEV_TC86C001=m
255CONFIG_RAID_ATTRS=m 255CONFIG_RAID_ATTRS=m
256CONFIG_SCSI=m 256CONFIG_SCSI=m
257CONFIG_SCSI_TGT=m
258CONFIG_BLK_DEV_SD=m 257CONFIG_BLK_DEV_SD=m
259CONFIG_CHR_DEV_ST=m 258CONFIG_CHR_DEV_ST=m
260CONFIG_CHR_DEV_OSST=m 259CONFIG_CHR_DEV_OSST=m
diff --git a/arch/mips/configs/malta_kvm_guest_defconfig b/arch/mips/configs/malta_kvm_guest_defconfig
index e36681c24ddc..edd9ec9cb678 100644
--- a/arch/mips/configs/malta_kvm_guest_defconfig
+++ b/arch/mips/configs/malta_kvm_guest_defconfig
@@ -254,7 +254,6 @@ CONFIG_BLK_DEV_IT8213=m
254CONFIG_BLK_DEV_TC86C001=m 254CONFIG_BLK_DEV_TC86C001=m
255CONFIG_RAID_ATTRS=m 255CONFIG_RAID_ATTRS=m
256CONFIG_SCSI=m 256CONFIG_SCSI=m
257CONFIG_SCSI_TGT=m
258CONFIG_BLK_DEV_SD=m 257CONFIG_BLK_DEV_SD=m
259CONFIG_CHR_DEV_ST=m 258CONFIG_CHR_DEV_ST=m
260CONFIG_CHR_DEV_OSST=m 259CONFIG_CHR_DEV_OSST=m
diff --git a/arch/mips/configs/markeins_defconfig b/arch/mips/configs/markeins_defconfig
index 4c2c0c4b9bb1..0f08e4623ee4 100644
--- a/arch/mips/configs/markeins_defconfig
+++ b/arch/mips/configs/markeins_defconfig
@@ -134,7 +134,6 @@ CONFIG_BLK_DEV_LOOP=m
134CONFIG_BLK_DEV_CRYPTOLOOP=m 134CONFIG_BLK_DEV_CRYPTOLOOP=m
135CONFIG_SGI_IOC4=m 135CONFIG_SGI_IOC4=m
136CONFIG_SCSI=m 136CONFIG_SCSI=m
137CONFIG_SCSI_TGT=m
138# CONFIG_SCSI_PROC_FS is not set 137# CONFIG_SCSI_PROC_FS is not set
139CONFIG_BLK_DEV_SD=m 138CONFIG_BLK_DEV_SD=m
140CONFIG_CHR_DEV_SG=m 139CONFIG_CHR_DEV_SG=m
diff --git a/arch/mips/configs/nlm_xlp_defconfig b/arch/mips/configs/nlm_xlp_defconfig
index 5468b1c7b2a5..2f660e9a0da6 100644
--- a/arch/mips/configs/nlm_xlp_defconfig
+++ b/arch/mips/configs/nlm_xlp_defconfig
@@ -334,7 +334,6 @@ CONFIG_BLK_DEV_RAM=y
334CONFIG_BLK_DEV_RAM_SIZE=65536 334CONFIG_BLK_DEV_RAM_SIZE=65536
335CONFIG_CDROM_PKTCDVD=y 335CONFIG_CDROM_PKTCDVD=y
336CONFIG_RAID_ATTRS=m 336CONFIG_RAID_ATTRS=m
337CONFIG_SCSI_TGT=m
338CONFIG_BLK_DEV_SD=y 337CONFIG_BLK_DEV_SD=y
339CONFIG_CHR_DEV_ST=m 338CONFIG_CHR_DEV_ST=m
340CONFIG_CHR_DEV_OSST=m 339CONFIG_CHR_DEV_OSST=m
@@ -346,10 +345,8 @@ CONFIG_SCSI_CONSTANTS=y
346CONFIG_SCSI_LOGGING=y 345CONFIG_SCSI_LOGGING=y
347CONFIG_SCSI_SCAN_ASYNC=y 346CONFIG_SCSI_SCAN_ASYNC=y
348CONFIG_SCSI_SPI_ATTRS=m 347CONFIG_SCSI_SPI_ATTRS=m
349CONFIG_SCSI_FC_TGT_ATTRS=y
350CONFIG_SCSI_SAS_LIBSAS=m 348CONFIG_SCSI_SAS_LIBSAS=m
351CONFIG_SCSI_SRP_ATTRS=m 349CONFIG_SCSI_SRP_ATTRS=m
352CONFIG_SCSI_SRP_TGT_ATTRS=y
353CONFIG_ISCSI_TCP=m 350CONFIG_ISCSI_TCP=m
354CONFIG_LIBFCOE=m 351CONFIG_LIBFCOE=m
355CONFIG_SCSI_DEBUG=m 352CONFIG_SCSI_DEBUG=m
diff --git a/arch/mips/configs/nlm_xlr_defconfig b/arch/mips/configs/nlm_xlr_defconfig
index 44b473420d51..c6f84655c98a 100644
--- a/arch/mips/configs/nlm_xlr_defconfig
+++ b/arch/mips/configs/nlm_xlr_defconfig
@@ -311,7 +311,6 @@ CONFIG_CDROM_PKTCDVD=y
311CONFIG_MISC_DEVICES=y 311CONFIG_MISC_DEVICES=y
312CONFIG_RAID_ATTRS=m 312CONFIG_RAID_ATTRS=m
313CONFIG_SCSI=y 313CONFIG_SCSI=y
314CONFIG_SCSI_TGT=m
315CONFIG_BLK_DEV_SD=y 314CONFIG_BLK_DEV_SD=y
316CONFIG_CHR_DEV_ST=m 315CONFIG_CHR_DEV_ST=m
317CONFIG_CHR_DEV_OSST=m 316CONFIG_CHR_DEV_OSST=m
@@ -323,10 +322,8 @@ CONFIG_SCSI_CONSTANTS=y
323CONFIG_SCSI_LOGGING=y 322CONFIG_SCSI_LOGGING=y
324CONFIG_SCSI_SCAN_ASYNC=y 323CONFIG_SCSI_SCAN_ASYNC=y
325CONFIG_SCSI_SPI_ATTRS=m 324CONFIG_SCSI_SPI_ATTRS=m
326CONFIG_SCSI_FC_TGT_ATTRS=y
327CONFIG_SCSI_SAS_LIBSAS=m 325CONFIG_SCSI_SAS_LIBSAS=m
328CONFIG_SCSI_SRP_ATTRS=m 326CONFIG_SCSI_SRP_ATTRS=m
329CONFIG_SCSI_SRP_TGT_ATTRS=y
330CONFIG_ISCSI_TCP=m 327CONFIG_ISCSI_TCP=m
331CONFIG_LIBFCOE=m 328CONFIG_LIBFCOE=m
332CONFIG_SCSI_DEBUG=m 329CONFIG_SCSI_DEBUG=m
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig
index 73e7bf49461c..29d79ae8a823 100644
--- a/arch/mips/configs/rm200_defconfig
+++ b/arch/mips/configs/rm200_defconfig
@@ -221,7 +221,6 @@ CONFIG_ATA_OVER_ETH=m
221CONFIG_SGI_IOC4=m 221CONFIG_SGI_IOC4=m
222CONFIG_RAID_ATTRS=m 222CONFIG_RAID_ATTRS=m
223CONFIG_SCSI=y 223CONFIG_SCSI=y
224CONFIG_SCSI_TGT=m
225CONFIG_BLK_DEV_SD=y 224CONFIG_BLK_DEV_SD=y
226CONFIG_CHR_DEV_ST=m 225CONFIG_CHR_DEV_ST=m
227CONFIG_BLK_DEV_SR=m 226CONFIG_BLK_DEV_SR=m
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig
index d99b1905a1ba..9327b3af32cd 100644
--- a/arch/mips/configs/tb0226_defconfig
+++ b/arch/mips/configs/tb0226_defconfig
@@ -39,7 +39,6 @@ CONFIG_BLK_DEV_RAM=y
39CONFIG_BLK_DEV_XIP=y 39CONFIG_BLK_DEV_XIP=y
40# CONFIG_MISC_DEVICES is not set 40# CONFIG_MISC_DEVICES is not set
41CONFIG_SCSI=y 41CONFIG_SCSI=y
42CONFIG_SCSI_TGT=m
43CONFIG_BLK_DEV_SD=y 42CONFIG_BLK_DEV_SD=y
44CONFIG_SCSI_MULTI_LUN=y 43CONFIG_SCSI_MULTI_LUN=y
45CONFIG_SCSI_SCAN_ASYNC=y 44CONFIG_SCSI_SCAN_ASYNC=y
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig
index c415c4f0e5c2..a967289b7970 100644
--- a/arch/mips/configs/tb0287_defconfig
+++ b/arch/mips/configs/tb0287_defconfig
@@ -44,7 +44,6 @@ CONFIG_BLK_DEV_NBD=m
44CONFIG_BLK_DEV_RAM=y 44CONFIG_BLK_DEV_RAM=y
45CONFIG_BLK_DEV_XIP=y 45CONFIG_BLK_DEV_XIP=y
46# CONFIG_MISC_DEVICES is not set 46# CONFIG_MISC_DEVICES is not set
47CONFIG_SCSI_TGT=m
48CONFIG_BLK_DEV_SD=y 47CONFIG_BLK_DEV_SD=y
49CONFIG_SCSI_SCAN_ASYNC=y 48CONFIG_SCSI_SCAN_ASYNC=y
50# CONFIG_SCSI_LOWLEVEL is not set 49# CONFIG_SCSI_LOWLEVEL is not set
diff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig
index c05310a913be..c936fab9ec4a 100644
--- a/arch/powerpc/configs/52xx/motionpro_defconfig
+++ b/arch/powerpc/configs/52xx/motionpro_defconfig
@@ -43,7 +43,6 @@ CONFIG_BLK_DEV_RAM=y
43CONFIG_BLK_DEV_RAM_SIZE=32768 43CONFIG_BLK_DEV_RAM_SIZE=32768
44CONFIG_MISC_DEVICES=y 44CONFIG_MISC_DEVICES=y
45CONFIG_EEPROM_LEGACY=y 45CONFIG_EEPROM_LEGACY=y
46CONFIG_SCSI_TGT=y
47CONFIG_BLK_DEV_SD=y 46CONFIG_BLK_DEV_SD=y
48CONFIG_CHR_DEV_SG=y 47CONFIG_CHR_DEV_SG=y
49CONFIG_ATA=y 48CONFIG_ATA=y
diff --git a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
index bcbe74716689..9b192bb6bd3d 100644
--- a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
@@ -54,7 +54,6 @@ CONFIG_BLK_DEV_LOOP=y
54CONFIG_BLK_DEV_RAM=y 54CONFIG_BLK_DEV_RAM=y
55CONFIG_BLK_DEV_RAM_SIZE=131072 55CONFIG_BLK_DEV_RAM_SIZE=131072
56CONFIG_IDE=y 56CONFIG_IDE=y
57CONFIG_SCSI_TGT=y
58CONFIG_BLK_DEV_SD=y 57CONFIG_BLK_DEV_SD=y
59CONFIG_CHR_DEV_SG=y 58CONFIG_CHR_DEV_SG=y
60CONFIG_ATA=y 59CONFIG_ATA=y
diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig
index 530601e8ccfe..69fd8adf9f5e 100644
--- a/arch/powerpc/configs/mpc5200_defconfig
+++ b/arch/powerpc/configs/mpc5200_defconfig
@@ -47,7 +47,6 @@ CONFIG_BLK_DEV_LOOP=y
47CONFIG_BLK_DEV_RAM=y 47CONFIG_BLK_DEV_RAM=y
48CONFIG_BLK_DEV_RAM_SIZE=32768 48CONFIG_BLK_DEV_RAM_SIZE=32768
49CONFIG_EEPROM_AT24=y 49CONFIG_EEPROM_AT24=y
50CONFIG_SCSI_TGT=y
51CONFIG_BLK_DEV_SD=y 50CONFIG_BLK_DEV_SD=y
52CONFIG_CHR_DEV_SG=y 51CONFIG_CHR_DEV_SG=y
53CONFIG_ATA=y 52CONFIG_ATA=y
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index c91066944842..fec5870f1818 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -425,10 +425,8 @@ CONFIG_SCSI_LOGGING=y
425CONFIG_SCSI_SCAN_ASYNC=y 425CONFIG_SCSI_SCAN_ASYNC=y
426CONFIG_SCSI_SPI_ATTRS=m 426CONFIG_SCSI_SPI_ATTRS=m
427CONFIG_SCSI_SRP_ATTRS=m 427CONFIG_SCSI_SRP_ATTRS=m
428CONFIG_SCSI_SRP_TGT_ATTRS=y
429CONFIG_SCSI_MESH=m 428CONFIG_SCSI_MESH=m
430CONFIG_SCSI_MAC53C94=m 429CONFIG_SCSI_MAC53C94=m
431CONFIG_SCSI_SRP=m
432CONFIG_SCSI_LOWLEVEL_PCMCIA=y 430CONFIG_SCSI_LOWLEVEL_PCMCIA=y
433CONFIG_SCSI_DH=y 431CONFIG_SCSI_DH=y
434CONFIG_SCSI_DH_RDAC=m 432CONFIG_SCSI_DH_RDAC=m
diff --git a/arch/s390/configs/default_defconfig b/arch/s390/configs/default_defconfig
index fd09a10a2b53..3ca1894ade09 100644
--- a/arch/s390/configs/default_defconfig
+++ b/arch/s390/configs/default_defconfig
@@ -366,7 +366,6 @@ CONFIG_VIRTIO_BLK=y
366CONFIG_ENCLOSURE_SERVICES=m 366CONFIG_ENCLOSURE_SERVICES=m
367CONFIG_RAID_ATTRS=m 367CONFIG_RAID_ATTRS=m
368CONFIG_SCSI=y 368CONFIG_SCSI=y
369CONFIG_SCSI_TGT=m
370CONFIG_BLK_DEV_SD=y 369CONFIG_BLK_DEV_SD=y
371CONFIG_CHR_DEV_ST=m 370CONFIG_CHR_DEV_ST=m
372CONFIG_CHR_DEV_OSST=m 371CONFIG_CHR_DEV_OSST=m
@@ -380,7 +379,6 @@ CONFIG_SCSI_LOGGING=y
380CONFIG_SCSI_SPI_ATTRS=m 379CONFIG_SCSI_SPI_ATTRS=m
381CONFIG_SCSI_SAS_LIBSAS=m 380CONFIG_SCSI_SAS_LIBSAS=m
382CONFIG_SCSI_SRP_ATTRS=m 381CONFIG_SCSI_SRP_ATTRS=m
383CONFIG_SCSI_SRP_TGT_ATTRS=y
384CONFIG_ISCSI_TCP=m 382CONFIG_ISCSI_TCP=m
385CONFIG_LIBFCOE=m 383CONFIG_LIBFCOE=m
386CONFIG_SCSI_DEBUG=m 384CONFIG_SCSI_DEBUG=m
diff --git a/arch/s390/configs/gcov_defconfig b/arch/s390/configs/gcov_defconfig
index b061180d3544..4830aa6e6f53 100644
--- a/arch/s390/configs/gcov_defconfig
+++ b/arch/s390/configs/gcov_defconfig
@@ -363,7 +363,6 @@ CONFIG_VIRTIO_BLK=y
363CONFIG_ENCLOSURE_SERVICES=m 363CONFIG_ENCLOSURE_SERVICES=m
364CONFIG_RAID_ATTRS=m 364CONFIG_RAID_ATTRS=m
365CONFIG_SCSI=y 365CONFIG_SCSI=y
366CONFIG_SCSI_TGT=m
367CONFIG_BLK_DEV_SD=y 366CONFIG_BLK_DEV_SD=y
368CONFIG_CHR_DEV_ST=m 367CONFIG_CHR_DEV_ST=m
369CONFIG_CHR_DEV_OSST=m 368CONFIG_CHR_DEV_OSST=m
@@ -377,7 +376,6 @@ CONFIG_SCSI_LOGGING=y
377CONFIG_SCSI_SPI_ATTRS=m 376CONFIG_SCSI_SPI_ATTRS=m
378CONFIG_SCSI_SAS_LIBSAS=m 377CONFIG_SCSI_SAS_LIBSAS=m
379CONFIG_SCSI_SRP_ATTRS=m 378CONFIG_SCSI_SRP_ATTRS=m
380CONFIG_SCSI_SRP_TGT_ATTRS=y
381CONFIG_ISCSI_TCP=m 379CONFIG_ISCSI_TCP=m
382CONFIG_LIBFCOE=m 380CONFIG_LIBFCOE=m
383CONFIG_SCSI_DEBUG=m 381CONFIG_SCSI_DEBUG=m
diff --git a/arch/s390/configs/performance_defconfig b/arch/s390/configs/performance_defconfig
index d279baa08014..61db449bf309 100644
--- a/arch/s390/configs/performance_defconfig
+++ b/arch/s390/configs/performance_defconfig
@@ -361,7 +361,6 @@ CONFIG_VIRTIO_BLK=y
361CONFIG_ENCLOSURE_SERVICES=m 361CONFIG_ENCLOSURE_SERVICES=m
362CONFIG_RAID_ATTRS=m 362CONFIG_RAID_ATTRS=m
363CONFIG_SCSI=y 363CONFIG_SCSI=y
364CONFIG_SCSI_TGT=m
365CONFIG_BLK_DEV_SD=y 364CONFIG_BLK_DEV_SD=y
366CONFIG_CHR_DEV_ST=m 365CONFIG_CHR_DEV_ST=m
367CONFIG_CHR_DEV_OSST=m 366CONFIG_CHR_DEV_OSST=m
@@ -375,7 +374,6 @@ CONFIG_SCSI_LOGGING=y
375CONFIG_SCSI_SPI_ATTRS=m 374CONFIG_SCSI_SPI_ATTRS=m
376CONFIG_SCSI_SAS_LIBSAS=m 375CONFIG_SCSI_SAS_LIBSAS=m
377CONFIG_SCSI_SRP_ATTRS=m 376CONFIG_SCSI_SRP_ATTRS=m
378CONFIG_SCSI_SRP_TGT_ATTRS=y
379CONFIG_ISCSI_TCP=m 377CONFIG_ISCSI_TCP=m
380CONFIG_LIBFCOE=m 378CONFIG_LIBFCOE=m
381CONFIG_SCSI_DEBUG=m 379CONFIG_SCSI_DEBUG=m
diff --git a/arch/sh/configs/sh2007_defconfig b/arch/sh/configs/sh2007_defconfig
index 0c08d9244c97..e741b1e36acd 100644
--- a/arch/sh/configs/sh2007_defconfig
+++ b/arch/sh/configs/sh2007_defconfig
@@ -52,7 +52,6 @@ CONFIG_CDROM_PKTCDVD=y
52# CONFIG_MISC_DEVICES is not set 52# CONFIG_MISC_DEVICES is not set
53CONFIG_RAID_ATTRS=y 53CONFIG_RAID_ATTRS=y
54CONFIG_SCSI=y 54CONFIG_SCSI=y
55CONFIG_SCSI_TGT=y
56CONFIG_BLK_DEV_SD=y 55CONFIG_BLK_DEV_SD=y
57CONFIG_BLK_DEV_SR=y 56CONFIG_BLK_DEV_SR=y
58CONFIG_CHR_DEV_SG=y 57CONFIG_CHR_DEV_SG=y
diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig
index 730e40d9cf62..91de7dd7427f 100644
--- a/arch/tile/configs/tilegx_defconfig
+++ b/arch/tile/configs/tilegx_defconfig
@@ -170,7 +170,6 @@ CONFIG_BLK_DEV_RAM=y
170CONFIG_BLK_DEV_RAM_SIZE=16384 170CONFIG_BLK_DEV_RAM_SIZE=16384
171CONFIG_ATA_OVER_ETH=m 171CONFIG_ATA_OVER_ETH=m
172CONFIG_RAID_ATTRS=m 172CONFIG_RAID_ATTRS=m
173CONFIG_SCSI_TGT=m
174CONFIG_BLK_DEV_SD=y 173CONFIG_BLK_DEV_SD=y
175CONFIG_SCSI_CONSTANTS=y 174CONFIG_SCSI_CONSTANTS=y
176CONFIG_SCSI_LOGGING=y 175CONFIG_SCSI_LOGGING=y
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig
index 80fc32ed0491..c7702b7ab7a5 100644
--- a/arch/tile/configs/tilepro_defconfig
+++ b/arch/tile/configs/tilepro_defconfig
@@ -301,7 +301,6 @@ CONFIG_BLK_DEV_RAM=y
301CONFIG_BLK_DEV_RAM_SIZE=16384 301CONFIG_BLK_DEV_RAM_SIZE=16384
302CONFIG_ATA_OVER_ETH=m 302CONFIG_ATA_OVER_ETH=m
303CONFIG_RAID_ATTRS=m 303CONFIG_RAID_ATTRS=m
304CONFIG_SCSI_TGT=m
305CONFIG_BLK_DEV_SD=y 304CONFIG_BLK_DEV_SD=y
306CONFIG_SCSI_CONSTANTS=y 305CONFIG_SCSI_CONSTANTS=y
307CONFIG_SCSI_LOGGING=y 306CONFIG_SCSI_LOGGING=y