UBUNTU: [Config] highbank -- commonise J-L modules missmatches

    CONFIG_KEYBOARD_XTKBD=m
    CONFIG_KS8842=m
    CONFIG_KS8851=m
    CONFIG_KS8851_MLL=m
    CONFIG_LIBERTAS=m
    CONFIG_LIBERTAS_THINFIRM=m
    CONFIG_LIBFC=m
    CONFIG_LIBFCOE=m

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

8 files changed, 10 insertions, 70 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 2a24ce2112f..ae786a8cbbe 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -115,22 +115,14 @@ CONFIG_JFS_SECURITY=y
 CONFIG_JFS_STATISTICS=y
 CONFIG_KARMA_PARTITION=y
 CONFIG_KEXEC=y
-CONFIG_KEYBOARD_XTKBD=m
 CONFIG_KGDB=y
 CONFIG_KPROBES=y
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
 CONFIG_KSM=y
 # CONFIG_KTIME_SCALAR is not set
 CONFIG_LATENCYTOP=y
 CONFIG_LDM_PARTITION=y
 CONFIG_LEGACY_PTY_COUNT=0
-CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_MESH=y
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
 CONFIG_LIBIPW_DEBUG=y
 CONFIG_LIS3L02DQ=m
 CONFIG_LLC=y
@@ -283,10 +275,8 @@ CONFIG_SCHED_SMT=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_DEBUG=m
 CONFIG_SCSI_DH=m
-CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_OSD_INITIATOR=m
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 47c4b9fc46a..fa9c0d27941 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -117,22 +117,14 @@ CONFIG_JFS_STATISTICS=y
 CONFIG_KARMA_PARTITION=y
 CONFIG_KEXEC=y
 CONFIG_KEYBOARD_SAMSUNG=m
-CONFIG_KEYBOARD_XTKBD=m
 CONFIG_KGDB=y
 CONFIG_KPROBES=y
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
 # CONFIG_KSM is not set
 CONFIG_KTIME_SCALAR=y
 CONFIG_LATENCYTOP=y
 CONFIG_LDM_PARTITION=y
 CONFIG_LEGACY_PTY_COUNT=0
-CONFIG_LIBERTAS=m
 # CONFIG_LIBERTAS_MESH is not set
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
 # CONFIG_LIS3L02DQ is not set
 CONFIG_LLC=m
 CONFIG_LOGIG940_FF=y
@@ -289,10 +281,8 @@ CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_DEBUG=m
 CONFIG_SCSI_DH=m
-CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_NETLINK=y
 # CONFIG_SCSI_OSD_INITIATOR is not set
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 62586ff9d5d..6d42e69e001 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -76,17 +76,9 @@ CONFIG_IP_PNP=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KEXEC is not set
 # CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KPROBES is not set
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851 is not set
-# CONFIG_KS8851_MLL is not set
 # CONFIG_LDM_PARTITION is not set
 CONFIG_LEGACY_PTY_COUNT=256
-# CONFIG_LIBERTAS is not set
-# CONFIG_LIBERTAS_THINFIRM is not set
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
 # CONFIG_LOGIG940_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
 # CONFIG_LOGITECH_FF is not set
@@ -221,10 +213,8 @@ CONFIG_SATA_AHCI_PLATFORM=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_DH is not set
-# CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_NETLINK is not set
 # CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 0411007c9e6..76234bc8c58 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -76,17 +76,9 @@ CONFIG_JFS_STATISTICS=y
 CONFIG_KARMA_PARTITION=y
 CONFIG_KEXEC=y
 CONFIG_KEYBOARD_SAMSUNG=m
-CONFIG_KEYBOARD_XTKBD=m
 CONFIG_KPROBES=y
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
 CONFIG_LDM_PARTITION=y
 CONFIG_LEGACY_PTY_COUNT=0
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
@@ -221,10 +213,8 @@ CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_DEBUG=m
 CONFIG_SCSI_DH=m
-CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SCAN_ASYNC=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index a169b5905ff..65abefd76d4 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2842,6 +2842,7 @@ CONFIG_KEYBOARD_TC3589X=m
 CONFIG_KEYBOARD_TCA6416=m
 CONFIG_KEYBOARD_TCA8418=m
 CONFIG_KEYBOARD_TWL4030=m
+CONFIG_KEYBOARD_XTKBD=m
 CONFIG_KEYS=y
 CONFIG_KEYS_COMPAT=y
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
@@ -2856,6 +2857,9 @@ CONFIG_KRETPROBES=y
 CONFIG_KS0108=m
 CONFIG_KS0108_DELAY=2
 CONFIG_KS0108_PORT=0x378
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
 CONFIG_KS959_DONGLE=m
 CONFIG_KSDAZZLE_DONGLE=m
 CONFIG_KSZ884X_PCI=m
@@ -2939,13 +2943,17 @@ CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_LIBCRC32C=m
+CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_CS=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS_SDIO=m
 CONFIG_LIBERTAS_SPI=m
+CONFIG_LIBERTAS_THINFIRM=m
 # CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
 CONFIG_LIBERTAS_THINFIRM_USB=m
 CONFIG_LIBERTAS_USB=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
 CONFIG_LIBIPW=m
 CONFIG_LINE6_USB=m
 # CONFIG_LINE6_USB_DEBUG is not set
@@ -4492,6 +4500,7 @@ CONFIG_SCSI_EATA_LINKED_COMMANDS=y
 CONFIG_SCSI_EATA_MAX_TAGS=16
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_FC_TGT_ATTRS=y
 CONFIG_SCSI_FD_MCS=m
 # CONFIG_SCSI_FLASHPOINT is not set
@@ -4541,6 +4550,7 @@ CONFIG_SCSI_NCR53C8XX_MAX_TAGS=4
 CONFIG_SCSI_NCR53C8XX_SYNC=5
 CONFIG_SCSI_NCR_D700=m
 CONFIG_SCSI_NCR_Q720=m
+CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_NSP32=m
 # CONFIG_SCSI_OSD_DEBUG is not set
 CONFIG_SCSI_OSD_DPRINT_SENSE=1
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 04cf7f39791..e42ab24d8e2 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -116,22 +116,14 @@ CONFIG_JFS_SECURITY=y
 CONFIG_JFS_STATISTICS=y
 CONFIG_KARMA_PARTITION=y
 CONFIG_KEXEC=y
-CONFIG_KEYBOARD_XTKBD=m
 CONFIG_KGDB=y
 CONFIG_KPROBES=y
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
 CONFIG_KSM=y
 CONFIG_KTIME_SCALAR=y
 CONFIG_LATENCYTOP=y
 CONFIG_LDM_PARTITION=y
 CONFIG_LEGACY_PTY_COUNT=0
-CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_MESH=y
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
 CONFIG_LIBIPW_DEBUG=y
 CONFIG_LIS3L02DQ=m
 CONFIG_LLC=y
@@ -283,10 +275,8 @@ CONFIG_SCHED_SMT=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_DEBUG=m
 CONFIG_SCSI_DH=m
-CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_OSD_INITIATOR=m
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index a5a4484e907..ad453c92209 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -106,19 +106,11 @@ CONFIG_JFS_SECURITY=y
 CONFIG_JFS_STATISTICS=y
 CONFIG_KARMA_PARTITION=y
 CONFIG_KEXEC=y
-CONFIG_KEYBOARD_XTKBD=m
 CONFIG_KPROBES=y
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
 CONFIG_KSM=y
 CONFIG_LDM_PARTITION=y
 CONFIG_LEGACY_PTY_COUNT=0
-CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_MESH=y
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_LIS3L02DQ=m
 CONFIG_LLC=y
@@ -273,10 +265,8 @@ CONFIG_SCHED_SMT=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_DEBUG=m
 CONFIG_SCSI_DH=m
-CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_OSD_INITIATOR=m
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 9003cfc152a..4cfdbc10720 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -117,21 +117,13 @@ CONFIG_JFS_STATISTICS=y
 CONFIG_KARMA_PARTITION=y
 CONFIG_KERNEL_START=0xc000000000000000
 CONFIG_KEXEC=y
-CONFIG_KEYBOARD_XTKBD=m
 CONFIG_KGDB=y
 CONFIG_KPROBES=y
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
 CONFIG_KSM=y
 CONFIG_LATENCYTOP=y
 CONFIG_LDM_PARTITION=y
 CONFIG_LEGACY_PTY_COUNT=0
-CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_MESH=y
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_LIS3L02DQ=m
 CONFIG_LLC=y
@@ -307,10 +299,8 @@ CONFIG_SCHED_SMT=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_DEBUG=m
 CONFIG_SCSI_DH=m
-CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_OSD_INITIATOR=m
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m