UBUNTU: [Config] highbank -- commonise G-I modules missmatches

  CONFIG_HTC_PASIC3=m
  CONFIG_IPMI_DEVICE_INTERFACE=m
  CONFIG_IPMI_HANDLER=m
  CONFIG_IPMI_POWEROFF=m
  CONFIG_IPMI_SI=m
  CONFIG_IPMI_WATCHDOG=m
  CONFIG_IPV6_MIP6=m
  CONFIG_IPV6_TUNNEL=m
  CONFIG_IP_DCCP=m
  CONFIG_ISCSI_BOOT_SYSFS=m
  CONFIG_ISCSI_TCP=m
  CONFIG_IWM=m

Signed-off-by: Andy Whitcroft <apw@canonical.com>

8 files changed, 13 insertions, 91 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 627b9f9888f..2a24ce2112f 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -85,7 +85,6 @@ CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HIDRAW=y
 CONFIG_HTC_I2CPLD=y
-CONFIG_HTC_PASIC3=m
 CONFIG_HUGETLB_PAGE=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=m
@@ -98,30 +97,19 @@ CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 CONFIG_INLINE_WRITE_UNLOCK=y
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 CONFIG_INTEL_TXT=y
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_MROUTE=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_TUNNEL=m
 CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_DCCP=m
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_PNP is not set
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 CONFIG_IRDA_DEBUG=y
 CONFIG_IRDA_FAST_RR=y
 CONFIG_IRDA_ULTRA=y
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_ISCSI_TCP=m
 CONFIG_ISDN=y
-CONFIG_IWM=m
 CONFIG_IWMC3200TOP_DEBUGFS=y
 CONFIG_JFS_SECURITY=y
 CONFIG_JFS_STATISTICS=y
@@ -296,7 +284,6 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_DEBUG=m
 CONFIG_SCSI_DH=m
 CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_NETLINK=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index c6040c26b38..47c4b9fc46a 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -87,7 +87,6 @@ CONFIG_HIDRAW=y
 # CONFIG_HIGHMEM is not set
 CONFIG_HTC_EGPIO=y
 CONFIG_HTC_I2CPLD=y
-CONFIG_HTC_PASIC3=m
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_HVC_DCC=y
 CONFIG_HZ=128
@@ -99,30 +98,19 @@ CONFIG_INLINE_READ_UNLOCK_IRQ=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 CONFIG_INLINE_WRITE_UNLOCK=y
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_MROUTE=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_TUNNEL=m
 CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_DCCP=m
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_PNP is not set
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 CONFIG_IRDA_DEBUG=y
 CONFIG_IRDA_FAST_RR=y
 CONFIG_IRDA_ULTRA=y
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_ISCSI_TCP=m
 CONFIG_ISDN=y
-CONFIG_IWM=m
 # CONFIG_IWMC3200TOP_DEBUGFS is not set
 CONFIG_JFS_SECURITY=y
 CONFIG_JFS_STATISTICS=y
@@ -302,7 +290,6 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_DEBUG=m
 CONFIG_SCSI_DH=m
 CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_NETLINK=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 19dafe917fa..62586ff9d5d 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -49,7 +49,6 @@ CONFIG_EXT2_FS=y
 CONFIG_HIGHMEM=y
 # CONFIG_HTC_EGPIO is not set
 # CONFIG_HTC_I2CPLD is not set
-# CONFIG_HTC_PASIC3 is not set
 # CONFIG_HVC_DCC is not set
 CONFIG_HZ=100
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
@@ -59,30 +58,19 @@ CONFIG_I2C_HELPER_AUTO=y
 # CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
 # CONFIG_INLINE_WRITE_UNLOCK is not set
 # CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
-# CONFIG_IPMI_DEVICE_INTERFACE is not set
-CONFIG_IPMI_HANDLER=y
-# CONFIG_IPMI_POWEROFF is not set
-CONFIG_IPMI_SI=y
-# CONFIG_IPMI_WATCHDOG is not set
-# CONFIG_IPV6_MIP6 is not set
 # CONFIG_IPV6_MROUTE is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
 # CONFIG_IPV6_SIT_6RD is not set
-# CONFIG_IPV6_TUNNEL is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_DCCP is not set
 # CONFIG_IP_MULTICAST is not set
 CONFIG_IP_PNP=y
 # CONFIG_IRDA_CACHE_LAST_LSAP is not set
 # CONFIG_IRDA_DEBUG is not set
 # CONFIG_IRDA_FAST_RR is not set
 # CONFIG_IRDA_ULTRA is not set
-# CONFIG_ISCSI_BOOT_SYSFS is not set
-# CONFIG_ISCSI_TCP is not set
 # CONFIG_ISDN is not set
-# CONFIG_IWM is not set
 # CONFIG_JFS_SECURITY is not set
 # CONFIG_JFS_STATISTICS is not set
 # CONFIG_KARMA_PARTITION is not set
@@ -234,7 +222,6 @@ CONFIG_SATA_AHCI_PLATFORM=y
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_NETLINK is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 02f97ec42ed..0411007c9e6 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -49,7 +49,6 @@ CONFIG_HIDRAW=y
 # CONFIG_HIGHMEM is not set
 CONFIG_HTC_EGPIO=y
 CONFIG_HTC_I2CPLD=y
-CONFIG_HTC_PASIC3=m
 CONFIG_HVC_DCC=y
 CONFIG_HZ=128
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
@@ -59,30 +58,19 @@ CONFIG_INLINE_READ_UNLOCK_IRQ=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 CONFIG_INLINE_WRITE_UNLOCK=y
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_MROUTE=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_TUNNEL=m
 CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_DCCP=m
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_PNP is not set
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 CONFIG_IRDA_DEBUG=y
 CONFIG_IRDA_FAST_RR=y
 CONFIG_IRDA_ULTRA=y
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_ISCSI_TCP=m
 CONFIG_ISDN=y
-CONFIG_IWM=m
 CONFIG_JFS_SECURITY=y
 CONFIG_JFS_STATISTICS=y
 CONFIG_KARMA_PARTITION=y
@@ -234,7 +222,6 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_DEBUG=m
 CONFIG_SCSI_DH=m
 CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_NETLINK=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 0bac9610df1..a169b5905ff 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2185,6 +2185,7 @@ CONFIG_HP_WMI=m
 CONFIG_HSI=m
 CONFIG_HSI_BOARDINFO=y
 CONFIG_HSI_CHAR=m
+CONFIG_HTC_PASIC3=m
 CONFIG_HT_IRQ=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
@@ -2541,9 +2542,15 @@ CONFIG_IPDDP=m
 CONFIG_IPDDP_DECAP=y
 CONFIG_IPDDP_ENCAP=y
 # CONFIG_IPIC is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_POWEROFF=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPPP_FILTER=y
 CONFIG_IPV6=y
+CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_OPTIMISTIC_DAD is not set
@@ -2551,6 +2558,7 @@ CONFIG_IPV6_PIMSM_V2=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_TUNNEL=m
 CONFIG_IPW2100=m
 # CONFIG_IPW2100_DEBUG is not set
 CONFIG_IPW2100_MONITOR=y
@@ -2563,6 +2571,7 @@ CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPWIRELESS=m
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
+CONFIG_IP_DCCP=m
 # CONFIG_IP_DCCP_CCID2_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
@@ -2672,9 +2681,11 @@ CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 CONFIG_ISAPNP=y
 CONFIG_ISA_DMA_API=y
+CONFIG_ISCSI_BOOT_SYSFS=m
 CONFIG_ISCSI_IBFT=m
 CONFIG_ISCSI_IBFT_FIND=y
 CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TCP=m
 CONFIG_ISDN_AUDIO=y
 CONFIG_ISDN_CAPI=m
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -2732,6 +2743,7 @@ CONFIG_IWLWIFI_DEVICE_TESTMODE=y
 CONFIG_IWLWIFI_DEVICE_TRACING=y
 # CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set
 # CONFIG_IWLWIFI_P2P is not set
+CONFIG_IWM=m
 CONFIG_IWMC3200TOP=m
 # CONFIG_IWMC3200TOP_DEBUG is not set
 # CONFIG_IWM_DEBUG is not set
@@ -4504,6 +4516,7 @@ CONFIG_SCSI_IPR=m
 # CONFIG_SCSI_IPR_TRACE is not set
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_ISCSI_ATTRS=m
 # CONFIG_SCSI_IZIP_EPP16 is not set
 # CONFIG_SCSI_IZIP_SLOW_CTR is not set
 CONFIG_SCSI_LOWLEVEL=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 6bde70ce96e..04cf7f39791 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -85,7 +85,6 @@ CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HIDRAW=y
 CONFIG_HIGHMEM=y
 CONFIG_HTC_I2CPLD=y
-CONFIG_HTC_PASIC3=m
 CONFIG_HUGETLB_PAGE=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=m
@@ -98,20 +97,12 @@ CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 CONFIG_INLINE_WRITE_UNLOCK=y
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 # CONFIG_INTEL_TXT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_MROUTE=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_TUNNEL=m
 CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_DCCP=m
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_PNP is not set
 CONFIG_IRDA_CACHE_LAST_LSAP=y
@@ -119,10 +110,7 @@ CONFIG_IRDA_DEBUG=y
 CONFIG_IRDA_FAST_RR=y
 CONFIG_IRDA_ULTRA=y
 CONFIG_ISA=y
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_ISCSI_TCP=m
 CONFIG_ISDN=y
-CONFIG_IWM=m
 CONFIG_IWMC3200TOP_DEBUGFS=y
 CONFIG_JFS_SECURITY=y
 CONFIG_JFS_STATISTICS=y
@@ -296,7 +284,6 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_DEBUG=m
 CONFIG_SCSI_DH=m
 CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_NETLINK=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index d7062c22592..a5a4484e907 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -75,7 +75,6 @@ CONFIG_HAMRADIO=y
 CONFIG_HIDRAW=y
 CONFIG_HIGHMEM=y
 CONFIG_HTC_I2CPLD=y
-CONFIG_HTC_PASIC3=m
 # CONFIG_HVC_CONSOLE is not set
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=y
@@ -87,20 +86,12 @@ CONFIG_INLINE_READ_UNLOCK_IRQ=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 CONFIG_INLINE_WRITE_UNLOCK=y
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_MROUTE=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_TUNNEL=m
 CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_DCCP=m
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_PNP is not set
 CONFIG_IRDA_CACHE_LAST_LSAP=y
@@ -109,10 +100,7 @@ CONFIG_IRDA_FAST_RR=y
 CONFIG_IRDA_ULTRA=y
 # CONFIG_IRQ_ALL_CPUS is not set
 # CONFIG_ISA is not set
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_ISCSI_TCP=m
 CONFIG_ISDN=y
-CONFIG_IWM=m
 CONFIG_IWMC3200TOP_DEBUGFS=y
 CONFIG_JFS_SECURITY=y
 CONFIG_JFS_STATISTICS=y
@@ -286,7 +274,6 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_DEBUG=m
 CONFIG_SCSI_DH=m
 CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_NETLINK=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 0cdb739eef4..9003cfc152a 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -85,7 +85,6 @@ CONFIG_HAMRADIO=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HIDRAW=y
 CONFIG_HTC_I2CPLD=y
-CONFIG_HTC_PASIC3=m
 CONFIG_HUGETLB_PAGE=y
 CONFIG_HVC_CONSOLE=y
 CONFIG_HZ=250
@@ -98,20 +97,12 @@ CONFIG_INLINE_READ_UNLOCK_IRQ=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 CONFIG_INLINE_WRITE_UNLOCK=y
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_MROUTE=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_TUNNEL=m
 CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_DCCP=m
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_PNP is not set
 CONFIG_IRDA_CACHE_LAST_LSAP=y
@@ -119,10 +110,7 @@ CONFIG_IRDA_DEBUG=y
 CONFIG_IRDA_FAST_RR=y
 CONFIG_IRDA_ULTRA=y
 CONFIG_IRQ_ALL_CPUS=y
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_ISCSI_TCP=m
 CONFIG_ISDN=y
-CONFIG_IWM=m
 CONFIG_IWMC3200TOP_DEBUGFS=y
 CONFIG_JFS_SECURITY=y
 CONFIG_JFS_STATISTICS=y
@@ -320,7 +308,6 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_DEBUG=m
 CONFIG_SCSI_DH=m
 CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_NETLINK=y