From bd68b945c34caeab31f30d4f5b866f7c931ef8a0 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Fri, 8 Jun 2012 11:46:30 +0100 Subject: [PATCH 32/34] UBUNTU: [Config] highbank -- commonise S modules missmatches CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_SRP_ATTRS=m CONFIG_SCSI_TGT=m CONFIG_SDIO_UART=m CONFIG_SEEQ8005=m CONFIG_SERIAL_8250=m CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_MAX3100=m CONFIG_SERIAL_MAX3107=m CONFIG_SERIAL_TIMBERDALE=m CONFIG_SERIAL_XILINX_PS_UART=m CONFIG_SERIO_ALTERA_PS2=m CONFIG_SERIO_PARKBD=m CONFIG_SERIO_PS2MULT=m CONFIG_SERIO_RAW=m CONFIG_SMC911X=m CONFIG_SMC91X=m CONFIG_SMSC911X=m CONFIG_SPEAKUP_SYNTH_DUMMY=m CONFIG_SPI_ALTERA=m CONFIG_SPI_BITBANG=m CONFIG_SPI_BUTTERFLY=m CONFIG_SPI_DESIGNWARE=m CONFIG_SPI_GPIO=m CONFIG_SPI_LM70_LLP=m CONFIG_SPI_OC_TINY=m CONFIG_SPI_SPIDEV=m CONFIG_SPI_TLE62X0=m CONFIG_STE10XP=y CONFIG_STMMAC_ETH=m Signed-off-by: Andy Whitcroft --- debian.master/config/amd64/config.common.amd64 | 26 -------------- debian.master/config/armel/config.common.armel | 29 --------------- debian.master/config/armhf/config.common.armhf | 4 +-- debian.master/config/armhf/config.flavour.highbank | 37 +++----------------- debian.master/config/armhf/config.flavour.omap | 33 ++--------------- debian.master/config/config.common.ubuntu | 29 +++++++++++++++ debian.master/config/i386/config.common.i386 | 26 -------------- debian.master/config/powerpc/config.common.powerpc | 26 -------------- debian.master/config/ppc64/config.common.ppc64 | 26 -------------- 9 files changed, 37 insertions(+), 199 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 59099df..b71977a 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -274,40 +274,23 @@ CONFIG_SCHEDSTATS=y CONFIG_SCHED_AUTOGROUP=y CONFIG_SCHED_SMT=y CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=y CONFIG_SCSI_LOGGING=y CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_OSD_INITIATOR=m CONFIG_SCSI_QLA_ISCSI=m -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SCSI_SPI_ATTRS=y -CONFIG_SCSI_SRP_ATTRS=m CONFIG_SCSI_SYM53C8XX_2=y -CONFIG_SCSI_TGT=m -CONFIG_SDIO_UART=m CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DISABLE=y CONFIG_SECURITY_TOMOYO=y -CONFIG_SEEQ8005=m CONFIG_SENSORS_LIS3LV02D=m CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_ALTERA_JTAGUART=m -CONFIG_SERIAL_ALTERA_UART=m -CONFIG_SERIAL_MAX3100=m -CONFIG_SERIAL_MAX3107=m CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_PMACZILOG is not set -CONFIG_SERIAL_TIMBERDALE=m -CONFIG_SERIAL_XILINX_PS_UART=m -CONFIG_SERIO_ALTERA_PS2=m -CONFIG_SERIO_PARKBD=m -CONFIG_SERIO_PS2MULT=m -CONFIG_SERIO_RAW=m CONFIG_SERIO_SERPORT=m CONFIG_SGI_PARTITION=y CONFIG_SM_FTL=m @@ -321,17 +304,9 @@ CONFIG_SND_OPL3_LIB_SEQ=m CONFIG_SOLARIS_X86_PARTITION=y CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSE_IRQ=y -CONFIG_SPEAKUP_SYNTH_DUMMY=m -CONFIG_SPI_ALTERA=m -CONFIG_SPI_BITBANG=m -CONFIG_SPI_BUTTERFLY=m CONFIG_SPI_DESIGNWARE=y -CONFIG_SPI_GPIO=m -CONFIG_SPI_LM70_LLP=m -CONFIG_SPI_OC_TINY=m # CONFIG_SPI_PXA2XX_PCI is not set CONFIG_SPI_SPIDEV=m -CONFIG_SPI_TLE62X0=m CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_XZ=y @@ -340,7 +315,6 @@ CONFIG_STACK_TRACER=y CONFIG_STAGING_MEDIA=y # CONFIG_STANDALONE is not set CONFIG_STE10XP=y -CONFIG_STMMAC_ETH=m CONFIG_SUN_PARTITION=y CONFIG_SYSCTL_SYSCALL=y CONFIG_SYSCTL_SYSCALL_CHECK=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index bc1aa1e..ff5f37f 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -258,44 +258,24 @@ CONFIG_SATA_MV=m CONFIG_SCHEDSTATS=y CONFIG_SCHED_AUTOGROUP=y CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=y CONFIG_SCSI_LOGGING=y CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_OSD_INITIATOR is not set -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SCAN_ASYNC=y # CONFIG_SCSI_SPI_ATTRS is not set -CONFIG_SCSI_SRP_ATTRS=m -CONFIG_SCSI_TGT=m -CONFIG_SDIO_UART=m CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DISABLE=y CONFIG_SECURITY_TOMOYO=y -CONFIG_SEEQ8005=m CONFIG_SENSORS_LIS3LV02D=m CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SERIAL_8250=y -CONFIG_SERIAL_ALTERA_JTAGUART=m -CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_AMBA_PL010=m CONFIG_SERIAL_AMBA_PL011=m -CONFIG_SERIAL_MAX3100=m -CONFIG_SERIAL_MAX3107=m CONFIG_SERIAL_NONSTANDARD=y -CONFIG_SERIAL_TIMBERDALE=m -CONFIG_SERIAL_XILINX_PS_UART=m -CONFIG_SERIO_ALTERA_PS2=m CONFIG_SERIO_AMBAKMI=m -CONFIG_SERIO_PARKBD=m -CONFIG_SERIO_PS2MULT=m -CONFIG_SERIO_RAW=m CONFIG_SERIO_SERPORT=m CONFIG_SGI_PARTITION=y -CONFIG_SMC911X=m -CONFIG_SMC91X=m -CONFIG_SMSC911X=m CONFIG_SM_FTL=m # CONFIG_SND_EMU10K1_SEQ is not set # CONFIG_SND_OPL3_LIB_SEQ is not set @@ -304,18 +284,10 @@ CONFIG_SND_PCM_OSS=m # CONFIG_SND_SBAWE_SEQ is not set CONFIG_SOLARIS_X86_PARTITION=y # CONFIG_SPARSE_IRQ is not set -CONFIG_SPEAKUP_SYNTH_DUMMY=m -CONFIG_SPI_ALTERA=m -CONFIG_SPI_BITBANG=m -CONFIG_SPI_BUTTERFLY=m CONFIG_SPI_DESIGNWARE=m -CONFIG_SPI_GPIO=m -CONFIG_SPI_LM70_LLP=m -CONFIG_SPI_OC_TINY=m CONFIG_SPI_PL022=m # CONFIG_SPI_PXA2XX_PCI is not set # CONFIG_SPI_SPIDEV is not set -CONFIG_SPI_TLE62X0=m CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_XZ=y @@ -323,7 +295,6 @@ CONFIG_SQUASHFS_XZ=y CONFIG_STAGING_MEDIA=y CONFIG_STANDALONE=y CONFIG_STE10XP=y -CONFIG_STMMAC_ETH=m CONFIG_SUN_PARTITION=y # CONFIG_SWP_EMULATE is not set CONFIG_SYSCTL_SYSCALL=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 33abd5c..2973bc0 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -88,7 +88,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_SCHEDSTATS=y # CONFIG_SCHED_SMT is not set # CONFIG_SCSI_OSD_INITIATOR is not set -# CONFIG_SCSI_SPI_ATTRS is not set CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SM_FTL=m # CONFIG_SND_EMU10K1_SEQ is not set @@ -97,10 +96,11 @@ CONFIG_SM_FTL=m CONFIG_SND_PCM_OSS=m # CONFIG_SND_SBAWE_SEQ is not set # CONFIG_SPARSE_IRQ is not set +CONFIG_SPI_DESIGNWARE=m # CONFIG_SPI_PXA2XX_PCI is not set -# CONFIG_SPI_SPIDEV is not set # CONFIG_STACK_TRACER is not set CONFIG_STANDALONE=y +CONFIG_STE10XP=y # CONFIG_SYS_HYPERVISOR is not set CONFIG_TABLET_USB_WACOM=m # CONFIG_TCG_TPM is not set diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index 851ab7d..4aaf75a 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -175,58 +175,29 @@ CONFIG_SATA_AHCI_PLATFORM=y # CONFIG_SATA_MV is not set # CONFIG_SCHED_AUTOGROUP is not set # CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_DEBUG is not set -# CONFIG_SCSI_DH is not set +CONFIG_SCSI_DH=m # CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_MULTI_LUN is not set -# CONFIG_SCSI_SAS_ATTRS is not set -# CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SCAN_ASYNC is not set -# CONFIG_SCSI_SRP_ATTRS is not set -# CONFIG_SCSI_TGT is not set -# CONFIG_SDIO_UART is not set +CONFIG_SCSI_SPI_ATTRS=m # CONFIG_SECURITY_SELINUX_BOOTPARAM is not set # CONFIG_SECURITY_SELINUX_DISABLE is not set # CONFIG_SECURITY_TOMOYO is not set -# CONFIG_SEEQ8005 is not set # CONFIG_SENSORS_LIS3LV02D is not set -# CONFIG_SERIAL_8250 is not set -# CONFIG_SERIAL_ALTERA_JTAGUART is not set -# CONFIG_SERIAL_ALTERA_UART is not set +CONFIG_SERIAL_8250=m # CONFIG_SERIAL_AMBA_PL010 is not set CONFIG_SERIAL_AMBA_PL011=y -# CONFIG_SERIAL_MAX3100 is not set -# CONFIG_SERIAL_MAX3107 is not set # CONFIG_SERIAL_NONSTANDARD is not set -# CONFIG_SERIAL_TIMBERDALE is not set -# CONFIG_SERIAL_XILINX_PS_UART is not set -# CONFIG_SERIO_ALTERA_PS2 is not set # CONFIG_SERIO_AMBAKMI is not set -# CONFIG_SERIO_PARKBD is not set -# CONFIG_SERIO_PS2MULT is not set -# CONFIG_SERIO_RAW is not set CONFIG_SERIO_SERPORT=y # CONFIG_SGI_PARTITION is not set -# CONFIG_SMC911X is not set -# CONFIG_SMC91X is not set -# CONFIG_SMSC911X is not set # CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_SPEAKUP_SYNTH_DUMMY is not set -# CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_BITBANG is not set -# CONFIG_SPI_BUTTERFLY is not set -# CONFIG_SPI_DESIGNWARE is not set -# CONFIG_SPI_GPIO is not set -# CONFIG_SPI_LM70_LLP is not set -# CONFIG_SPI_OC_TINY is not set CONFIG_SPI_PL022=y -# CONFIG_SPI_TLE62X0 is not set +CONFIG_SPI_SPIDEV=m # CONFIG_SQUASHFS_LZO is not set # CONFIG_SQUASHFS_XATTR is not set # CONFIG_SQUASHFS_XZ is not set # CONFIG_STAGING_MEDIA is not set -CONFIG_STE10XP=m -# CONFIG_STMMAC_ETH is not set # CONFIG_SUN_PARTITION is not set CONFIG_SWP_EMULATE=y # CONFIG_SYSCTL_SYSCALL is not set diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index b03091d..df1ba4d 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -175,58 +175,29 @@ CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SATA_MV=m CONFIG_SCHED_AUTOGROUP=y CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=y CONFIG_SCSI_LOGGING=y CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_SCSI_SRP_ATTRS=m -CONFIG_SCSI_TGT=m -CONFIG_SDIO_UART=m +# CONFIG_SCSI_SPI_ATTRS is not set CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DISABLE=y CONFIG_SECURITY_TOMOYO=y -CONFIG_SEEQ8005=m CONFIG_SENSORS_LIS3LV02D=m CONFIG_SERIAL_8250=y -CONFIG_SERIAL_ALTERA_JTAGUART=m -CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_AMBA_PL010=m CONFIG_SERIAL_AMBA_PL011=m -CONFIG_SERIAL_MAX3100=m -CONFIG_SERIAL_MAX3107=m CONFIG_SERIAL_NONSTANDARD=y -CONFIG_SERIAL_TIMBERDALE=m -CONFIG_SERIAL_XILINX_PS_UART=m -CONFIG_SERIO_ALTERA_PS2=m CONFIG_SERIO_AMBAKMI=m -CONFIG_SERIO_PARKBD=m -CONFIG_SERIO_PS2MULT=m -CONFIG_SERIO_RAW=m CONFIG_SERIO_SERPORT=m CONFIG_SGI_PARTITION=y -CONFIG_SMC911X=m -CONFIG_SMC91X=m -CONFIG_SMSC911X=m CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_SPEAKUP_SYNTH_DUMMY=m -CONFIG_SPI_ALTERA=m -CONFIG_SPI_BITBANG=m -CONFIG_SPI_BUTTERFLY=m -CONFIG_SPI_DESIGNWARE=m -CONFIG_SPI_GPIO=m -CONFIG_SPI_LM70_LLP=m -CONFIG_SPI_OC_TINY=m CONFIG_SPI_PL022=m -CONFIG_SPI_TLE62X0=m +# CONFIG_SPI_SPIDEV is not set CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_XZ=y CONFIG_STAGING_MEDIA=y -CONFIG_STE10XP=y -CONFIG_STMMAC_ETH=m CONFIG_SUN_PARTITION=y # CONFIG_SWP_EMULATE is not set CONFIG_SYSCTL_SYSCALL=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 0208ff8..489515a 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -4340,6 +4340,7 @@ CONFIG_SCSI_CXGB3_ISCSI=m CONFIG_SCSI_CXGB4_ISCSI=m CONFIG_SCSI_DC390T=m CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH_ALUA=m CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_HP_SW=m @@ -4416,9 +4417,12 @@ CONFIG_SCSI_QLA_FC=m CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLOGIC_FAS=m CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_HOST_SMP=y +CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SIM710=m CONFIG_SCSI_SRP=m +CONFIG_SCSI_SRP_ATTRS=m CONFIG_SCSI_SRP_TGT_ATTRS=y CONFIG_SCSI_STEX=m CONFIG_SCSI_SYM53C416=m @@ -4427,6 +4431,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 CONFIG_SCSI_SYM53C8XX_MMIO=y CONFIG_SCSI_T128=m +CONFIG_SCSI_TGT=m CONFIG_SCSI_U14_34F=m CONFIG_SCSI_U14_34F_LINKED_COMMANDS=y CONFIG_SCSI_U14_34F_MAX_TAGS=8 @@ -4446,6 +4451,7 @@ CONFIG_SCx200_I2C=m CONFIG_SCx200_I2C_SCL=12 CONFIG_SCx200_I2C_SDA=13 CONFIG_SCx200_WDT=m +CONFIG_SDIO_UART=m CONFIG_SDLA=m CONFIG_SEALEVEL_4021=m CONFIG_SECCOMP=y @@ -4471,6 +4477,7 @@ CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" CONFIG_SECURITY_YAMA=y +CONFIG_SEEQ8005=m CONFIG_SELECT_MEMORY_MODEL=y CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ABITUGURU3=m @@ -4614,6 +4621,8 @@ CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_RSA=y CONFIG_SERIAL_8250_RUNTIME_UARTS=32 CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_ALTERA_JTAGUART=m +CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y @@ -4622,6 +4631,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_ICOM is not set # CONFIG_SERIAL_IFX6X60 is not set CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_MAX3100=m +CONFIG_SERIAL_MAX3107=m CONFIG_SERIAL_MFD_HSU=m CONFIG_SERIAL_MRST_MAX3110=m CONFIG_SERIAL_OF_PLATFORM=m @@ -4630,12 +4641,18 @@ CONFIG_SERIAL_OMAP_CONSOLE=y CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_PMACZILOG_CONSOLE=y # CONFIG_SERIAL_PMACZILOG_TTYS is not set +CONFIG_SERIAL_TIMBERDALE=m CONFIG_SERIAL_UARTLITE=m +CONFIG_SERIAL_XILINX_PS_UART=m CONFIG_SERIO=y +CONFIG_SERIO_ALTERA_PS2=m CONFIG_SERIO_CT82C710=m CONFIG_SERIO_I8042=y CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_PARKBD=m CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_PS2MULT=m +CONFIG_SERIO_RAW=m CONFIG_SERIO_XILINX_XPS_PS2=m CONFIG_SFC=m CONFIG_SFC_MTD=y @@ -4669,12 +4686,15 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set CONFIG_SMARTJOYPLUS_FF=y +CONFIG_SMC911X=m CONFIG_SMC9194=m +CONFIG_SMC91X=m CONFIG_SMCTR=m CONFIG_SMC_IRCC_FIR=m CONFIG_SMP=y CONFIG_SMP_ON_UP=y CONFIG_SMSC37B787_WDT=m +CONFIG_SMSC911X=m # CONFIG_SMSC911X_ARCH_HOOKS is not set CONFIG_SMSC9420=m CONFIG_SMSC_PHY=y @@ -5032,19 +5052,27 @@ CONFIG_SPEAKUP_SYNTH_DECEXT=m CONFIG_SPEAKUP_SYNTH_DECPC=m CONFIG_SPEAKUP_SYNTH_DECTLK=m CONFIG_SPEAKUP_SYNTH_DTLK=m +CONFIG_SPEAKUP_SYNTH_DUMMY=m CONFIG_SPEAKUP_SYNTH_KEYPC=m CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m CONFIG_SPI=y +CONFIG_SPI_ALTERA=m +CONFIG_SPI_BITBANG=m +CONFIG_SPI_BUTTERFLY=m # CONFIG_SPI_DEBUG is not set CONFIG_SPI_DW_MID_DMA=y # CONFIG_SPI_DW_MMIO is not set CONFIG_SPI_DW_PCI=m +CONFIG_SPI_GPIO=m +CONFIG_SPI_LM70_LLP=m CONFIG_SPI_MASTER=y +CONFIG_SPI_OC_TINY=m CONFIG_SPI_OMAP24XX=m CONFIG_SPI_PXA2XX=m +CONFIG_SPI_TLE62X0=m CONFIG_SPI_TOPCLIFF_PCH=m # CONFIG_SPI_XILINX is not set CONFIG_SPLIT_PTLOCK_CPUS=4 @@ -5079,6 +5107,7 @@ CONFIG_STALDRV=y # CONFIG_STMMAC_CHAINED is not set # CONFIG_STMMAC_DA is not set # CONFIG_STMMAC_DEBUG_FS is not set +CONFIG_STMMAC_ETH=m CONFIG_STMMAC_RING=y CONFIG_STOP_MACHINE=y CONFIG_STP=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 0ebb9b2..f9692e0 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -273,38 +273,21 @@ CONFIG_SCHEDSTATS=y CONFIG_SCHED_AUTOGROUP=y CONFIG_SCHED_SMT=y CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=y CONFIG_SCSI_LOGGING=y CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_OSD_INITIATOR=m CONFIG_SCSI_QLA_ISCSI=m -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_SCSI_SRP_ATTRS=m -CONFIG_SCSI_TGT=m -CONFIG_SDIO_UART=m CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DISABLE=y CONFIG_SECURITY_TOMOYO=y -CONFIG_SEEQ8005=m CONFIG_SENSORS_LIS3LV02D=m CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_ALTERA_JTAGUART=m -CONFIG_SERIAL_ALTERA_UART=m -CONFIG_SERIAL_MAX3100=m -CONFIG_SERIAL_MAX3107=m CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_PMACZILOG is not set -CONFIG_SERIAL_TIMBERDALE=m -CONFIG_SERIAL_XILINX_PS_UART=m -CONFIG_SERIO_ALTERA_PS2=m -CONFIG_SERIO_PARKBD=m -CONFIG_SERIO_PS2MULT=m -CONFIG_SERIO_RAW=m CONFIG_SERIO_SERPORT=m CONFIG_SGI_PARTITION=y CONFIG_SM_FTL=m @@ -318,17 +301,9 @@ CONFIG_SND_SBAWE_SEQ=m CONFIG_SOLARIS_X86_PARTITION=y # CONFIG_SPARSEMEM_MANUAL is not set CONFIG_SPARSE_IRQ=y -CONFIG_SPEAKUP_SYNTH_DUMMY=m -CONFIG_SPI_ALTERA=m -CONFIG_SPI_BITBANG=m -CONFIG_SPI_BUTTERFLY=m CONFIG_SPI_DESIGNWARE=y -CONFIG_SPI_GPIO=m -CONFIG_SPI_LM70_LLP=m -CONFIG_SPI_OC_TINY=m CONFIG_SPI_PXA2XX_PCI=y CONFIG_SPI_SPIDEV=m -CONFIG_SPI_TLE62X0=m CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_XZ=y @@ -337,7 +312,6 @@ CONFIG_STACK_TRACER=y CONFIG_STAGING_MEDIA=y # CONFIG_STANDALONE is not set CONFIG_STE10XP=y -CONFIG_STMMAC_ETH=m CONFIG_SUN_PARTITION=y CONFIG_SYSCTL_SYSCALL=y CONFIG_SYSCTL_SYSCALL_CHECK=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 5bc8e36..4372c04 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -261,40 +261,23 @@ CONFIG_SATA_SVW=y CONFIG_SCHED_AUTOGROUP=y CONFIG_SCHED_SMT=y CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=m # CONFIG_SCSI_IBMVSCSIS is not set CONFIG_SCSI_LOGGING=y CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SCSI_SPI_ATTRS=m -CONFIG_SCSI_SRP_ATTRS=m CONFIG_SCSI_SYM53C8XX_2=m -CONFIG_SCSI_TGT=m -CONFIG_SDIO_UART=m CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DISABLE=y CONFIG_SECURITY_TOMOYO=y -CONFIG_SEEQ8005=m CONFIG_SENSORS_LIS3LV02D=m # CONFIG_SENSORS_SCH56XX_COMMON is not set CONFIG_SERIAL_8250=m CONFIG_SERIAL_8250_PCI=m -CONFIG_SERIAL_ALTERA_JTAGUART=m -CONFIG_SERIAL_ALTERA_UART=m -CONFIG_SERIAL_MAX3100=m -CONFIG_SERIAL_MAX3107=m CONFIG_SERIAL_NONSTANDARD=y CONFIG_SERIAL_PMACZILOG=y -CONFIG_SERIAL_TIMBERDALE=m -CONFIG_SERIAL_XILINX_PS_UART=m -CONFIG_SERIO_ALTERA_PS2=m -CONFIG_SERIO_PARKBD=m -CONFIG_SERIO_PS2MULT=m -CONFIG_SERIO_RAW=m CONFIG_SERIO_SERPORT=m CONFIG_SGI_PARTITION=y # CONFIG_SM_FTL is not set @@ -308,17 +291,9 @@ CONFIG_SND_OPL3_LIB_SEQ=m CONFIG_SOLARIS_X86_PARTITION=y CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSE_IRQ=y -CONFIG_SPEAKUP_SYNTH_DUMMY=m -CONFIG_SPI_ALTERA=m -CONFIG_SPI_BITBANG=m -CONFIG_SPI_BUTTERFLY=m CONFIG_SPI_DESIGNWARE=y -CONFIG_SPI_GPIO=m -CONFIG_SPI_LM70_LLP=m -CONFIG_SPI_OC_TINY=m # CONFIG_SPI_PXA2XX_PCI is not set CONFIG_SPI_SPIDEV=m -CONFIG_SPI_TLE62X0=m CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_XZ=y @@ -327,7 +302,6 @@ CONFIG_SQUASHFS_XZ=y CONFIG_STAGING_MEDIA=y CONFIG_STANDALONE=y CONFIG_STE10XP=m -CONFIG_STMMAC_ETH=m CONFIG_SUN_PARTITION=y CONFIG_SYSCTL_SYSCALL=y CONFIG_SYSCTL_SYSCALL_CHECK=y diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index f4676a2..3de1fd3 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -293,41 +293,24 @@ CONFIG_SCHEDSTATS=y CONFIG_SCHED_AUTOGROUP=y CONFIG_SCHED_SMT=y CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=m CONFIG_SCSI_IBMVSCSIS=m CONFIG_SCSI_LOGGING=y CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_OSD_INITIATOR=m CONFIG_SCSI_QLA_ISCSI=m -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SCSI_SPI_ATTRS=m -CONFIG_SCSI_SRP_ATTRS=m CONFIG_SCSI_SYM53C8XX_2=m -CONFIG_SCSI_TGT=m -CONFIG_SDIO_UART=m CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DISABLE=y CONFIG_SECURITY_TOMOYO=y -CONFIG_SEEQ8005=m CONFIG_SENSORS_LIS3LV02D=m # CONFIG_SENSORS_SCH56XX_COMMON is not set CONFIG_SERIAL_8250=m CONFIG_SERIAL_8250_PCI=m -CONFIG_SERIAL_ALTERA_JTAGUART=m -CONFIG_SERIAL_ALTERA_UART=m -CONFIG_SERIAL_MAX3100=m -CONFIG_SERIAL_MAX3107=m CONFIG_SERIAL_NONSTANDARD=y CONFIG_SERIAL_PMACZILOG=y -CONFIG_SERIAL_TIMBERDALE=m -CONFIG_SERIAL_XILINX_PS_UART=m -CONFIG_SERIO_ALTERA_PS2=m -CONFIG_SERIO_PARKBD=m -CONFIG_SERIO_PS2MULT=m -CONFIG_SERIO_RAW=m CONFIG_SERIO_SERPORT=m CONFIG_SGI_PARTITION=y # CONFIG_SM_FTL is not set @@ -341,17 +324,9 @@ CONFIG_SND_OPL3_LIB_SEQ=m CONFIG_SOLARIS_X86_PARTITION=y CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSE_IRQ=y -CONFIG_SPEAKUP_SYNTH_DUMMY=m -CONFIG_SPI_ALTERA=m -CONFIG_SPI_BITBANG=m -CONFIG_SPI_BUTTERFLY=m CONFIG_SPI_DESIGNWARE=y -CONFIG_SPI_GPIO=m -CONFIG_SPI_LM70_LLP=m -CONFIG_SPI_OC_TINY=m # CONFIG_SPI_PXA2XX_PCI is not set CONFIG_SPI_SPIDEV=m -CONFIG_SPI_TLE62X0=m CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_XZ=y @@ -360,7 +335,6 @@ CONFIG_SSB_PCMCIAHOST=y CONFIG_STAGING_MEDIA=y CONFIG_STANDALONE=y CONFIG_STE10XP=m -CONFIG_STMMAC_ETH=m CONFIG_SUN_PARTITION=y CONFIG_SYSCTL_SYSCALL=y CONFIG_SYSCTL_SYSCALL_CHECK=y -- 1.7.9.5