UBUNTU: [Config] highbank -- commonise Q-R modules missmatches

    CONFIG_QFMT_V1=m
    CONFIG_QFMT_V2=m
    CONFIG_R3964=m
    CONFIG_R8712U=m
    CONFIG_RAID_ATTRS=m
    CONFIG_RAMOOPS=m
    CONFIG_RAW_DRIVER=m
    CONFIG_RT2X00=m
    CONFIG_RTC_DRV_PL031=m
    CONFIG_RTL8187=m
    CONFIG_RTL8192CU=m
    CONFIG_RTS5139=m

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

8 files changed, 12 insertions, 80 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index e725742f9b7..2d8b950b449 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -207,14 +207,7 @@ CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
 CONFIG_PSTORE=y
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
 CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_R3964=m
-CONFIG_R8712U=m
-CONFIG_RAID_ATTRS=m
-CONFIG_RAMOOPS=m
-CONFIG_RAW_DRIVER=m
 CONFIG_RCU_FANOUT=64
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
@@ -224,12 +217,8 @@ CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_RELAY=y
 CONFIG_RFKILL=y
 CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2X00=m
 # CONFIG_RT2X00_LIB_DEBUGFS is not set
 CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTL8187=m
-CONFIG_RTL8192CU=m
-CONFIG_RTS5139=m
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_MV=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index fb273ce0ce5..9d75aec4bb5 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -213,14 +213,7 @@ CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PRINT_QUOTA_WARNING=y
 CONFIG_PSTORE=y
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
 CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_R3964=m
-CONFIG_R8712U=m
-CONFIG_RAID_ATTRS=m
-CONFIG_RAMOOPS=m
-CONFIG_RAW_DRIVER=m
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -229,14 +222,9 @@ CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_RELAY=y
 CONFIG_RFKILL=y
 # CONFIG_RT2800USB_UNKNOWN is not set
-CONFIG_RT2X00=m
 CONFIG_RT2X00_LIB_DEBUGFS=y
 CONFIG_RTC_DRV_CMOS=m
-CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_TWL4030=y
-CONFIG_RTL8187=m
-CONFIG_RTL8192CU=m
-CONFIG_RTS5139=m
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_MV=m
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index c49352d00a4..266e3b72272 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -150,25 +150,13 @@ CONFIG_PREEMPT_RCU=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PRINTK_TIME is not set
 # CONFIG_PSTORE is not set
-# CONFIG_QFMT_V1 is not set
-# CONFIG_QFMT_V2 is not set
 # CONFIG_QUOTA_NETLINK_INTERFACE is not set
-# CONFIG_R3964 is not set
-# CONFIG_R8712U is not set
-# CONFIG_RAID_ATTRS is not set
-# CONFIG_RAMOOPS is not set
-# CONFIG_RAW_DRIVER is not set
 # CONFIG_REGULATOR is not set
 # CONFIG_REISERFS_FS_POSIX_ACL is not set
 # CONFIG_REISERFS_FS_SECURITY is not set
 # CONFIG_RELAY is not set
 # CONFIG_RFKILL is not set
-# CONFIG_RT2X00 is not set
-CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_TWL4030=m
-# CONFIG_RTL8187 is not set
-# CONFIG_RTL8192CU is not set
-# CONFIG_RTS5139 is not set
 CONFIG_SATA_AHCI_PLATFORM=y
 # CONFIG_SATA_MV is not set
 # CONFIG_SCHED_AUTOGROUP is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 2ac53be18e7..8aff091b232 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -150,25 +150,13 @@ CONFIG_PPP_MULTILINK=y
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PSTORE=y
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
 CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_R3964=m
-CONFIG_R8712U=m
-CONFIG_RAID_ATTRS=m
-CONFIG_RAMOOPS=m
-CONFIG_RAW_DRIVER=m
 CONFIG_REGULATOR=y
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_RELAY=y
 CONFIG_RFKILL=y
-CONFIG_RT2X00=m
-CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_TWL4030=y
-CONFIG_RTL8187=m
-CONFIG_RTL8192CU=m
-CONFIG_RTS5139=m
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_MV=m
 CONFIG_SCHED_AUTOGROUP=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index d9a47ecfcec..9395a3a5161 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4205,6 +4205,8 @@ CONFIG_PS3_VUART=y
 CONFIG_PSERIES_IDLE=y
 CONFIG_PSERIES_MSI=y
 # CONFIG_PTP_1588_CLOCK is not set
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
 CONFIG_QLA3XXX=m
 CONFIG_QLCNIC=m
 CONFIG_QLGE=m
@@ -4217,9 +4219,11 @@ CONFIG_QUOTACTL=y
 CONFIG_QUOTACTL_COMPAT=y
 # CONFIG_QUOTA_DEBUG is not set
 CONFIG_QUOTA_TREE=m
+CONFIG_R3964=m
 CONFIG_R6040=m
 CONFIG_R8169=m
 CONFIG_R8187SE=m
+CONFIG_R8712U=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
@@ -4244,6 +4248,8 @@ CONFIG_RADIO_WL1273=m
 CONFIG_RADIO_WL128X=m
 CONFIG_RADIO_ZOLTRIX=m
 CONFIG_RAID6_PQ=m
+CONFIG_RAID_ATTRS=m
+CONFIG_RAMOOPS=m
 CONFIG_RAPIDIO=y
 CONFIG_RAPIDIO_CPS_GEN2=y
 CONFIG_RAPIDIO_CPS_XX=y
@@ -4254,6 +4260,7 @@ CONFIG_RAPIDIO_TSI500=y
 CONFIG_RAPIDIO_TSI568=y
 CONFIG_RAPIDIO_TSI57X=y
 CONFIG_RAPIDIO_TSI721=y
+CONFIG_RAW_DRIVER=m
 # CONFIG_RCU_BOOST is not set
 # CONFIG_RCU_CPU_STALL_INFO is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
@@ -4364,6 +4371,7 @@ CONFIG_RT2800USB_RT33XX=y
 # CONFIG_RT2800USB_RT35XX is not set
 # CONFIG_RT2800USB_RT53XX is not set
 CONFIG_RT2800_LIB=m
+CONFIG_RT2X00=m
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_RT2X00_LIB=m
 CONFIG_RT2X00_LIB_CRYPTO=y
@@ -4417,6 +4425,7 @@ CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PL030=m
+CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_PS3=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RP5C01=m
@@ -4441,8 +4450,10 @@ CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_LIB=y
 CONFIG_RTL8180=m
+CONFIG_RTL8187=m
 CONFIG_RTL8187_LEDS=y
 CONFIG_RTL8192CE=m
+CONFIG_RTL8192CU=m
 CONFIG_RTL8192C_COMMON=m
 CONFIG_RTL8192DE=m
 CONFIG_RTL8192E=m
@@ -4454,6 +4465,7 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
 CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTS5139=m
 # CONFIG_RTS5139_DEBUG is not set
 CONFIG_RTS_PSTOR=m
 # CONFIG_RTS_PSTOR_DEBUG is not set
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index f5e5212f5fd..676d2057755 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -207,14 +207,7 @@ CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
 CONFIG_PSTORE=y
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
 CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_R3964=m
-CONFIG_R8712U=m
-CONFIG_RAID_ATTRS=m
-CONFIG_RAMOOPS=m
-CONFIG_RAW_DRIVER=m
 CONFIG_RCU_FANOUT=32
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_DEBUG=y
@@ -224,12 +217,8 @@ CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_RELAY=y
 CONFIG_RFKILL=y
 CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2X00=m
 # CONFIG_RT2X00_LIB_DEBUGFS is not set
 CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTL8187=m
-CONFIG_RTL8192CU=m
-CONFIG_RTS5139=m
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_MV=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 5ac7f11900a..44db53f0854 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -198,14 +198,7 @@ CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
 CONFIG_PSERIES_ENERGY=m
 CONFIG_PSTORE=y
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
 CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_R3964=m
-CONFIG_R8712U=m
-CONFIG_RAID_ATTRS=m
-CONFIG_RAMOOPS=m
-CONFIG_RAW_DRIVER=m
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
@@ -214,14 +207,10 @@ CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_RELAY=y
 CONFIG_RFKILL=y
 CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2X00=m
 # CONFIG_RT2X00_LIB_DEBUGFS is not set
 # CONFIG_RTAS_FLASH is not set
 CONFIG_RTC_DRV_CMOS=m
 CONFIG_RTC_DRV_TWL4030=m
-CONFIG_RTL8187=m
-CONFIG_RTL8192CU=m
-CONFIG_RTS5139=m
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_SVW=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 946c2600c07..e0c4d57a461 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -230,14 +230,7 @@ CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
 CONFIG_PSERIES_ENERGY=y
 CONFIG_PSTORE=y
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
 CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_R3964=m
-CONFIG_R8712U=m
-CONFIG_RAID_ATTRS=m
-CONFIG_RAMOOPS=m
-CONFIG_RAW_DRIVER=m
 CONFIG_RCU_FANOUT=64
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
@@ -247,14 +240,10 @@ CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_RELAY=y
 CONFIG_RFKILL=y
 CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2X00=m
 # CONFIG_RT2X00_LIB_DEBUGFS is not set
 CONFIG_RTAS_FLASH=y
 CONFIG_RTC_DRV_CMOS=m
 CONFIG_RTC_DRV_TWL4030=m
-CONFIG_RTL8187=m
-CONFIG_RTL8192CU=m
-CONFIG_RTS5139=m
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_SVW=y