UBUNTU: [Config] highbank -- commonise U-Z modules missmatches

    CONFIG_UIO=m
    CONFIG_USBIP_CORE=m
    CONFIG_USB_SERIAL_DEBUG=m
    CONFIG_VETH=m
    CONFIG_VIDEO_OUTPUT_CONTROL=m
    CONFIG_VT6656=m
    CONFIG_W35UND=m
    CONFIG_WAN_ROUTER=m
    CONFIG_WIMAX_I2400M_SDIO=m
    CONFIG_WIMAX_I2400M_USB=m
    CONFIG_WL1251=m
    CONFIG_WL12XX_MENU=m
    CONFIG_XFRM_USER=m
    CONFIG_XZ_DEC_TEST=m

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

9 files changed, 16 insertions, 86 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 269f0d8bc4e..7cfba45aa70 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -268,11 +268,9 @@ CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_EGALAX=m
 # CONFIG_TWL4030_CORE is not set
 CONFIG_TWL6040_CORE=y
-CONFIG_UIO=m
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNUSED_SYMBOLS=y
-CONFIG_USBIP_CORE=m
 CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
@@ -292,14 +290,11 @@ CONFIG_USB_NET2272=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_R8A66597=m
 CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_SERIAL_DEBUG=m
 CONFIG_VERSION_SIGNATURE=""
-CONFIG_VETH=m
 CONFIG_VFAT_FS=m
 CONFIG_VGASTATE=m
 CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=y
@@ -309,25 +304,18 @@ CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_RING=y
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VT6656=m
 CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_W35UND=m
 CONFIG_WAN=y
-CONFIG_WAN_ROUTER=m
 CONFIG_WATCHDOG=y
 CONFIG_WIMAX_I2400M_SDIO=m
 CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WL1251=m
-CONFIG_WL12XX_MENU=m
 CONFIG_WM8350_WATCHDOG=m
 # CONFIG_X86_32 is not set
 CONFIG_X86_64=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_X86_SPEEDSTEP_LIB=m
 CONFIG_XEN_MAX_DOMAIN_MEMORY=500
-CONFIG_XFRM_USER=m
 CONFIG_XFS_RT=y
-CONFIG_XZ_DEC_TEST=m
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_ZONE_DMA32=y
 CONFIG_ZONE_DMA_FLAG=1
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 6101cb52184..92f0837962f 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -276,11 +276,9 @@ CONFIG_TWL4030_CORE=y
 CONFIG_TWL4030_POWER=y
 CONFIG_TWL4030_USB=y
 CONFIG_TWL6040_CORE=y
-CONFIG_UIO=m
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNUSED_SYMBOLS=y
-CONFIG_USBIP_CORE=m
 CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 # CONFIG_USB_ARCH_HAS_XHCI is not set
@@ -300,30 +298,20 @@ CONFIG_USB_MV_UDC=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_R8A66597 is not set
 CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_SERIAL_DEBUG=m
 CONFIG_VERSION_SIGNATURE=""
-CONFIG_VETH=m
 CONFIG_VFAT_FS=y
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_VIRTIO_BALLOON is not set
 # CONFIG_VIRTIO_MMIO is not set
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VT6656=m
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_W35UND=m
 CONFIG_WAN=y
-CONFIG_WAN_ROUTER=m
 CONFIG_WATCHDOG=y
 # CONFIG_WIMAX_I2400M_SDIO is not set
 # CONFIG_WIMAX_I2400M_USB is not set
-CONFIG_WL1251=m
-CONFIG_WL12XX_MENU=m
 # CONFIG_WM8350_WATCHDOG is not set
-CONFIG_XFRM_USER=m
 CONFIG_XFS_RT=y
-CONFIG_XZ_DEC_TEST=m
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_ZONE_DMA_FLAG=0
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 7e6de7da4b6..c2f7753995a 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -106,8 +106,6 @@ CONFIG_VFAT_FS=y
 # CONFIG_VIRTIO_BALLOON is not set
 # CONFIG_VIRTIO_MMIO is not set
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
-# CONFIG_WIMAX_I2400M_SDIO is not set
-# CONFIG_WIMAX_I2400M_USB is not set
 # CONFIG_WM8350_WATCHDOG is not set
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_ZONE_DMA_FLAG=0
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 8658cca974c..c8b70463cb7 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -191,11 +191,9 @@ CONFIG_SWP_EMULATE=y
 # CONFIG_TOUCHSCREEN_W90X900 is not set
 # CONFIG_TWL4030_POWER is not set
 # CONFIG_TWL6040_CORE is not set
-# CONFIG_UIO is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNIXWARE_DISKLABEL is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USBIP_CORE is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_DWC3 is not set
@@ -204,19 +202,11 @@ CONFIG_USB_GPIO_VBUS=m
 CONFIG_USB_MUSB_HDRC=m
 # CONFIG_USB_MV_UDC is not set
 # CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
 CONFIG_VERSION_SIGNATURE="Ubuntu 3.2.0-1800.1-highbank 3.2.9"
-# CONFIG_VETH is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_VIRT_DRIVERS is not set
 # CONFIG_VLAN_8021Q_GVRP is not set
-# CONFIG_VT6656 is not set
-# CONFIG_W35UND is not set
 # CONFIG_WAN is not set
-# CONFIG_WAN_ROUTER is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_WL1251 is not set
-# CONFIG_WL12XX_MENU is not set
-# CONFIG_XFRM_USER is not set
+CONFIG_WIMAX_I2400M_SDIO=m
+CONFIG_WIMAX_I2400M_USB=m
 # CONFIG_XFS_RT is not set
-# CONFIG_XZ_DEC_TEST is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 5596910b9f9..b169187251f 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -191,11 +191,9 @@ CONFIG_TEST_KSTRTOX=m
 CONFIG_TOUCHSCREEN_W90X900=m
 CONFIG_TWL4030_POWER=y
 CONFIG_TWL6040_CORE=y
-CONFIG_UIO=m
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNUSED_SYMBOLS=y
-CONFIG_USBIP_CORE=m
 CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_DWC3=m
@@ -204,19 +202,11 @@ CONFIG_USB_GPIO_VBUS=y
 CONFIG_USB_MUSB_HDRC=y
 CONFIG_USB_MV_UDC=m
 CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_SERIAL_DEBUG=m
 CONFIG_VERSION_SIGNATURE=""
-CONFIG_VETH=m
-CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VT6656=m
-CONFIG_W35UND=m
 CONFIG_WAN=y
-CONFIG_WAN_ROUTER=m
 CONFIG_WATCHDOG=y
-CONFIG_WL1251=m
-CONFIG_WL12XX_MENU=m
-CONFIG_XFRM_USER=m
+# CONFIG_WIMAX_I2400M_SDIO is not set
+# CONFIG_WIMAX_I2400M_USB is not set
 CONFIG_XFS_RT=y
-CONFIG_XZ_DEC_TEST=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 66f0d5a2831..6576f5e4121 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5572,6 +5572,7 @@ CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 CONFIG_UID16=y
+CONFIG_UIO=m
 CONFIG_UIO_AEC=m
 CONFIG_UIO_CIF=m
 CONFIG_UIO_NETX=m
@@ -5588,6 +5589,7 @@ CONFIG_UNIX=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=m
 CONFIG_USB=y
+CONFIG_USBIP_CORE=m
 # CONFIG_USBIP_DEBUG is not set
 CONFIG_USBIP_HOST=m
 CONFIG_USBIP_VHCI_HCD=m
@@ -5795,6 +5797,7 @@ CONFIG_USB_SERIAL_CH341=m
 CONFIG_USB_SERIAL_CP210X=m
 CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_DEBUG=m
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT_TI=m
@@ -5932,6 +5935,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_V4L_RADIO_ISA_DRIVERS=y
 CONFIG_V4L_USB_DRIVERS=y
 CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_VETH=m
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
@@ -6025,6 +6029,7 @@ CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_OMAP2_VOUT=m
 CONFIG_VIDEO_OMAP2_VOUT_VRFB=y
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_PMS=m
 CONFIG_VIDEO_PVRUSB2=m
@@ -6114,6 +6119,7 @@ CONFIG_VORTEX=m
 CONFIG_VSX=y
 CONFIG_VT=y
 CONFIG_VT6655=m
+CONFIG_VT6656=m
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_VXFS_FS=m
@@ -6137,6 +6143,7 @@ CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_SMEM=m
 CONFIG_W1_SLAVE_THERM=m
+CONFIG_W35UND=m
 CONFIG_W83627HF_WDT=m
 CONFIG_W83697HF_WDT=m
 CONFIG_W83697UG_WDT=m
@@ -6145,6 +6152,7 @@ CONFIG_W83977F_WDT=m
 CONFIG_WAFER_WDT=m
 CONFIG_WANT_LLC=y
 CONFIG_WANXL=m
+CONFIG_WAN_ROUTER=m
 CONFIG_WAN_ROUTER_DRIVERS=m
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -6171,9 +6179,11 @@ CONFIG_WINDFARM_PM91=m
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_WL1251=m
 CONFIG_WL1251_SDIO=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL12XX=m
+CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_WL12XX_SDIO=m
 CONFIG_WL12XX_SPI=m
@@ -6299,6 +6309,7 @@ CONFIG_XFRM_IPCOMP=m
 # CONFIG_XFRM_MIGRATE is not set
 # CONFIG_XFRM_STATISTICS is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_USER=m
 # CONFIG_XFS_DEBUG is not set
 CONFIG_XFS_FS=m
 CONFIG_XFS_POSIX_ACL=y
@@ -6319,6 +6330,7 @@ CONFIG_XZ_DEC_BCJ=y
 CONFIG_XZ_DEC_IA64=y
 CONFIG_XZ_DEC_POWERPC=y
 CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_TEST=m
 CONFIG_XZ_DEC_X86=y
 CONFIG_YAM=m
 CONFIG_YELLOWFIN=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 24780ce647d..e65267c34c2 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -268,11 +268,9 @@ CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_EGALAX=m
 # CONFIG_TWL4030_CORE is not set
 CONFIG_TWL6040_CORE=y
-CONFIG_UIO=m
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNUSED_SYMBOLS=y
-CONFIG_USBIP_CORE=m
 CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
@@ -292,14 +290,11 @@ CONFIG_USB_NET2272=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_R8A66597=m
 CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_SERIAL_DEBUG=m
 CONFIG_VERSION_SIGNATURE=""
-CONFIG_VETH=m
 CONFIG_VFAT_FS=m
 CONFIG_VGASTATE=m
 CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=y
@@ -309,25 +304,18 @@ CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_RING=y
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VT6656=m
 CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_W35UND=m
 CONFIG_WAN=y
-CONFIG_WAN_ROUTER=m
 CONFIG_WATCHDOG=y
 CONFIG_WIMAX_I2400M_SDIO=m
 CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WL1251=m
-CONFIG_WL12XX_MENU=m
 CONFIG_WM8350_WATCHDOG=m
 CONFIG_X86_32=y
 # CONFIG_X86_64 is not set
 CONFIG_X86_MINIMUM_CPU_FAMILY=5
 CONFIG_X86_SPEEDSTEP_LIB=y
 CONFIG_XEN_MAX_DOMAIN_MEMORY=64
-CONFIG_XFRM_USER=m
 CONFIG_XFS_RT=y
-CONFIG_XZ_DEC_TEST=m
 CONFIG_ZLIB_DEFLATE=m
 # CONFIG_ZONE_DMA32 is not set
 CONFIG_ZONE_DMA_FLAG=1
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 180a3484605..0fed2bdcdd7 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -259,11 +259,9 @@ CONFIG_TOUCHSCREEN_EGALAX=m
 CONFIG_TWL4030_CORE=y
 CONFIG_TWL4030_USB=m
 CONFIG_TWL6040_CORE=y
-CONFIG_UIO=m
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNUSED_SYMBOLS=y
-CONFIG_USBIP_CORE=m
 CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
@@ -284,14 +282,11 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
 CONFIG_USB_R8A66597=m
 CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_SERIAL_DEBUG=m
 CONFIG_VERSION_SIGNATURE=""
-CONFIG_VETH=m
 CONFIG_VFAT_FS=m
 CONFIG_VGASTATE=m
 CONFIG_VGA_ARB_MAX_GPUS=16
 # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_VIRTIO=m
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
@@ -301,18 +296,11 @@ CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_RING=m
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VT6656=m
 CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_W35UND=m
 CONFIG_WAN=y
-CONFIG_WAN_ROUTER=m
 CONFIG_WATCHDOG=y
 CONFIG_WIMAX_I2400M_SDIO=m
 CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WL1251=m
-CONFIG_WL12XX_MENU=m
 CONFIG_WM8350_WATCHDOG=m
-CONFIG_XFRM_USER=m
 CONFIG_XFS_RT=y
-CONFIG_XZ_DEC_TEST=m
 CONFIG_ZONE_DMA_FLAG=1
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 7a7ae897244..1e477dc6b86 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -293,11 +293,9 @@ CONFIG_TOUCHSCREEN_EGALAX=m
 CONFIG_TWL4030_CORE=y
 CONFIG_TWL4030_USB=m
 CONFIG_TWL6040_CORE=y
-CONFIG_UIO=m
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNUSED_SYMBOLS=y
-CONFIG_USBIP_CORE=m
 CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
@@ -318,14 +316,11 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
 CONFIG_USB_R8A66597=m
 CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_SERIAL_DEBUG=m
 CONFIG_VERSION_SIGNATURE=""
-CONFIG_VETH=m
 CONFIG_VFAT_FS=m
 CONFIG_VGASTATE=m
 CONFIG_VGA_ARB_MAX_GPUS=64
 # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_VIRTIO=m
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
@@ -335,20 +330,13 @@ CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_RING=m
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VT6656=m
 CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_W35UND=m
 CONFIG_WAN=y
-CONFIG_WAN_ROUTER=m
 CONFIG_WATCHDOG=y
 CONFIG_WIMAX_I2400M_SDIO=m
 CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WL1251=m
-CONFIG_WL12XX_MENU=m
 CONFIG_WM8350_WATCHDOG=m
 CONFIG_WORD_SIZE=64
-CONFIG_XFRM_USER=m
 CONFIG_XFS_RT=y
-CONFIG_XZ_DEC_TEST=m
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZONE_DMA_FLAG=1