UBUNTU: [Config] highbank -- commonise S modules missmatches -- part 2

    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
    CONFIG_TARGET_CORE=m

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

8 files changed, 20 insertions, 128 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 548ea08e439..2601067c64b 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -239,10 +239,6 @@ CONFIG_SENSORS_SCH56XX_COMMON=m
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_NONSTANDARD=y
-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_SND_BT87X_OVERCLOCK is not set
@@ -252,17 +248,7 @@ CONFIG_SND_OPL3_LIB_SEQ=m
 # CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_SPARSEMEM_MANUAL=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_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
@@ -270,13 +256,10 @@ CONFIG_SQUASHFS_XZ=y
 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_SYSV68_PARTITION=y
 CONFIG_SYS_HYPERVISOR=y
-CONFIG_TARGET_CORE=m
 CONFIG_TASKSTATS=y
 CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index f5698c7b381..8cd0baf4cbe 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -244,47 +244,27 @@ CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_AMBA_PL010=m
 CONFIG_SERIAL_AMBA_PL011=m
 CONFIG_SERIAL_NONSTANDARD=y
-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_SND_EMU10K1_SEQ is not set
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 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_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
 # CONFIG_STACK_TRACER is not set
 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
 CONFIG_SYSV68_PARTITION=y
 # CONFIG_SYS_HYPERVISOR is not set
-CONFIG_TARGET_CORE=m
 CONFIG_TASKSTATS=y
 CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index c59b62d3b28..95f7d906419 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -171,39 +171,19 @@ CONFIG_SERIAL_8250=m
 # CONFIG_SERIAL_AMBA_PL010 is not set
 CONFIG_SERIAL_AMBA_PL011=y
 # CONFIG_SERIAL_NONSTANDARD 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_SPIDEV is not set
-# CONFIG_SPI_TLE62X0 is not set
 # 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
 # CONFIG_SYSV68_PARTITION is not set
-# CONFIG_TARGET_CORE is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_TCG_TPM is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index d286581870f..d72cb39ab0e 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -171,39 +171,19 @@ CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_AMBA_PL010=m
 CONFIG_SERIAL_AMBA_PL011=m
 CONFIG_SERIAL_NONSTANDARD=y
-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_SPIDEV=m
-CONFIG_SPI_TLE62X0=m
 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
 CONFIG_SYSV68_PARTITION=y
-CONFIG_TARGET_CORE=m
 CONFIG_TASKSTATS=y
 CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 3bda5e0b6e0..880d1180275 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4850,10 +4850,14 @@ 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_MCDI_MON=y
@@ -4889,12 +4893,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
@@ -5261,19 +5268,29 @@ 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_DESIGNWARE=m
 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_SPIDEV=m
+CONFIG_SPI_TLE62X0=m
 CONFIG_SPI_TOPCLIFF_PCH=m
 # CONFIG_SPI_XILINX is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
@@ -5305,9 +5322,11 @@ CONFIG_STACKTRACE=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_STAGING=y
 CONFIG_STALDRV=y
+CONFIG_STE10XP=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_PCI is not set
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_STMMAC_RING=y
@@ -5351,6 +5370,7 @@ CONFIG_TABLET_USB_GTCO=m
 CONFIG_TABLET_USB_HANWANG=m
 CONFIG_TABLET_USB_KBTAB=m
 CONFIG_TABLET_USB_WACOM=m
+CONFIG_TARGET_CORE=m
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_TASK_SIZE=0xc0000000
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index d1d275076b5..0af1729cd26 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -239,10 +239,6 @@ CONFIG_SENSORS_SCH56XX_COMMON=m
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_NONSTANDARD=y
-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_SND_BT87X_OVERCLOCK is not set
@@ -252,17 +248,7 @@ CONFIG_SND_OPL4_LIB_SEQ=m
 CONFIG_SND_SBAWE_SEQ=m
 CONFIG_SOLARIS_X86_PARTITION=y
 # CONFIG_SPARSEMEM_MANUAL 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_PXA2XX_PCI=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_TLE62X0=m
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_XZ=y
@@ -270,13 +256,10 @@ CONFIG_SQUASHFS_XZ=y
 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_SYSV68_PARTITION=y
 CONFIG_SYS_HYPERVISOR=y
-CONFIG_TARGET_CORE=m
 CONFIG_TASKSTATS=y
 CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 2a8eb4b07d0..eb3f8a466ba 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -229,10 +229,6 @@ CONFIG_SECURITY_TOMOYO=y
 CONFIG_SERIAL_8250=m
 CONFIG_SERIAL_8250_PCI=m
 CONFIG_SERIAL_NONSTANDARD=y
-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_SND_BT87X_OVERCLOCK=y
@@ -242,17 +238,7 @@ CONFIG_SND_OPL3_LIB_SEQ=m
 # CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_SPARSEMEM_MANUAL=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_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
@@ -260,13 +246,10 @@ CONFIG_SQUASHFS_XZ=y
 # CONFIG_STACK_TRACER is not set
 CONFIG_STAGING_MEDIA=y
 CONFIG_STANDALONE=y
-CONFIG_STE10XP=y
-CONFIG_STMMAC_ETH=m
 CONFIG_SUN_PARTITION=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_SYSV68_PARTITION=y
 # CONFIG_SYS_HYPERVISOR is not set
-CONFIG_TARGET_CORE=m
 CONFIG_TASKSTATS=y
 CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 61f02435561..9ea70997d0c 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -263,10 +263,6 @@ CONFIG_SECURITY_TOMOYO=y
 CONFIG_SERIAL_8250=m
 CONFIG_SERIAL_8250_PCI=m
 CONFIG_SERIAL_NONSTANDARD=y
-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_SND_BT87X_OVERCLOCK=y
@@ -276,17 +272,7 @@ CONFIG_SND_OPL3_LIB_SEQ=m
 # CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_SPARSEMEM_MANUAL=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_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
@@ -294,13 +280,10 @@ CONFIG_SSB_PCMCIAHOST=y
 # CONFIG_STACK_TRACER is not set
 CONFIG_STAGING_MEDIA=y
 CONFIG_STANDALONE=y
-CONFIG_STE10XP=y
-CONFIG_STMMAC_ETH=m
 CONFIG_SUN_PARTITION=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_SYSV68_PARTITION=y
 # CONFIG_SYS_HYPERVISOR is not set
-CONFIG_TARGET_CORE=m
 CONFIG_TASKSTATS=y
 CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y