From d0f6d514bb42b21f2cb70977a9ef3e98e2142207 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Fri, 8 Jun 2012 10:59:02 +0100 Subject: [PATCH 28/34] UBUNTU: [Config] highbank -- commonise J-L modules missmatches 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 --- debian.master/config/amd64/config.common.amd64 | 9 --------- debian.master/config/armel/config.common.armel | 9 --------- debian.master/config/armhf/config.flavour.highbank | 9 --------- debian.master/config/armhf/config.flavour.omap | 9 --------- debian.master/config/config.common.ubuntu | 9 +++++++++ debian.master/config/i386/config.common.i386 | 9 --------- debian.master/config/powerpc/config.common.powerpc | 9 --------- debian.master/config/ppc64/config.common.ppc64 | 9 --------- 8 files changed, 9 insertions(+), 63 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index e207d84..41978be 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -146,9 +146,6 @@ CONFIG_KARMA_PARTITION=y CONFIG_KEXEC=y 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_KVM=m @@ -156,11 +153,7 @@ CONFIG_KVM_BOOK3S_32=m 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 @@ -312,10 +305,8 @@ CONFIG_SCHED_SMT=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=y -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_QLA_ISCSI=m CONFIG_SCSI_SAS_ATTRS=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 35b4bdf..68b9fe1 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -132,19 +132,12 @@ CONFIG_KARMA_PARTITION=y CONFIG_KEXEC=y 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=m CONFIG_LLC=m CONFIG_LOGIG940_FF=y @@ -297,10 +290,8 @@ CONFIG_SCHED_AUTOGROUP=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=y -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 95236bf..94771cf 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -81,15 +81,8 @@ CONFIG_IP_PNP=y # CONFIG_KARMA_PARTITION is not set # CONFIG_KEXEC 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_LIS3L02DQ is not set # CONFIG_LOGIG940_FF is not set # CONFIG_LOGIRUMBLEPAD2_FF is not set @@ -216,10 +209,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 d5f0007..91f4a2a 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -81,15 +81,8 @@ CONFIG_JFS_STATISTICS=y CONFIG_KARMA_PARTITION=y CONFIG_KEXEC=y 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_LIS3L02DQ=m CONFIG_LOGIG940_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y @@ -216,10 +209,8 @@ CONFIG_SCHED_AUTOGROUP=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=y -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 4c985e2..45ed549 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2721,6 +2721,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 @@ -2800,13 +2803,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 @@ -4315,6 +4322,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 @@ -4363,6 +4371,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 016dd69..89d7196 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -145,9 +145,6 @@ CONFIG_KARMA_PARTITION=y CONFIG_KEXEC=y CONFIG_KGDB=y CONFIG_KPROBES=y -CONFIG_KS8842=m -CONFIG_KS8851=m -CONFIG_KS8851_MLL=m CONFIG_KSM=y CONFIG_KTIME_SCALAR=y CONFIG_KVM=m @@ -155,11 +152,7 @@ CONFIG_KVM_BOOK3S_32=m 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 @@ -311,10 +304,8 @@ CONFIG_SCHED_SMT=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=y -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_QLA_ISCSI=m CONFIG_SCSI_SAS_ATTRS=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 5fcf9a8..735103c 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -132,19 +132,12 @@ CONFIG_JFS_STATISTICS=y CONFIG_KARMA_PARTITION=y CONFIG_KEXEC=y CONFIG_KPROBES=y -CONFIG_KS8842=m -CONFIG_KS8851=m -CONFIG_KS8851_MLL=m CONFIG_KSM=y CONFIG_KVM=y # CONFIG_KVM_BOOK3S_32 is not set 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 @@ -299,11 +292,9 @@ CONFIG_SCHED_SMT=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=m -CONFIG_SCSI_FC_ATTRS=m # CONFIG_SCSI_IBMVSCSIS is not set 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 6bda333..6c21e7c 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -144,20 +144,13 @@ CONFIG_KERNEL_START=0xc000000000000000 CONFIG_KEXEC=y CONFIG_KGDB=y CONFIG_KPROBES=y -CONFIG_KS8842=m -CONFIG_KS8851=m -CONFIG_KS8851_MLL=m CONFIG_KSM=y CONFIG_KVM=y CONFIG_KVM_BOOK3S_32=m 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 @@ -331,11 +324,9 @@ CONFIG_SCHED_SMT=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=m -CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_IBMVSCSIS=m CONFIG_SCSI_LOGGING=y CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_NETLINK=y CONFIG_SCSI_OSD_INITIATOR=m CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_SAS_ATTRS=m -- 1.7.9.5