From 6ff41cbe6f3d8a485fb9480d5a6922c325f94dd0 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Fri, 8 Jun 2012 12:14:04 +0100 Subject: [PATCH 34/34] UBUNTU: [Config] highbank -- commonise U-Z modules missmatches CONFIG_UIO=m CONFIG_USBIP_CORE=m CONFIG_USB_GADGET=y 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 CONFIG_ZD1211RW=m CONFIG_ZRAM=m # CONFIG_USB_MUSB_HDRC is not set Signed-off-by: Andy Whitcroft --- debian.master/config/amd64/config.common.amd64 | 13 ------------- debian.master/config/armel/config.common.armel | 14 +------------- debian.master/config/armhf/config.common.armhf | 6 ++---- debian.master/config/armhf/config.flavour.highbank | 20 +++++--------------- debian.master/config/armhf/config.flavour.omap | 20 +++++--------------- debian.master/config/config.common.ubuntu | 14 +++++++++++++- debian.master/config/i386/config.common.i386 | 13 ------------- debian.master/config/powerpc/config.common.powerpc | 13 ------------- debian.master/config/ppc64/config.common.ppc64 | 13 ------------- 9 files changed, 26 insertions(+), 100 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index d3e29ef..c993bac 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -330,11 +330,9 @@ CONFIG_TPS65010=m CONFIG_TRANZPORT=m # CONFIG_TWL4030_CORE is not set CONFIG_TWL4030_USB=m -CONFIG_UIO=m CONFIG_ULTRIX_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_USBIP_CORE=m # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -363,18 +361,15 @@ CONFIG_USB_NET2272=m # CONFIG_USB_OTG is not set CONFIG_USB_R8A66597=m CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_SERIAL_DEBUG=m # CONFIG_USB_SERIAL_SAFE_PADDED is not set CONFIG_USB_SI470X=m CONFIG_USB_SN9C102=m CONFIG_VERSION_SIGNATURE="" -CONFIG_VETH=m CONFIG_VFAT_FS=m CONFIG_VGASTATE=m CONFIG_VGA_ARB_MAX_GPUS=16 # CONFIG_VIDEO_ADV7343 is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -CONFIG_VIDEO_OUTPUT_CONTROL=m # CONFIG_VIDEO_SAA7191 is not set # CONFIG_VIDEO_TCM825X is not set # CONFIG_VIDEO_TDA9875 is not set @@ -395,12 +390,9 @@ 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_X25_ASY=m # CONFIG_X86_32 is not set @@ -410,12 +402,7 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_X86_SPEEDSTEP_LIB=m CONFIG_X86_X2APIC=y CONFIG_XEN_PRIVILEGED_GUEST=y -CONFIG_XFRM_USER=m CONFIG_XFS_RT=y -CONFIG_XVMALLOC=y -CONFIG_XZ_DEC_TEST=m -CONFIG_ZD1211RW=m CONFIG_ZLIB_DEFLATE=m CONFIG_ZONE_DMA32=y CONFIG_ZONE_DMA_FLAG=1 -CONFIG_ZRAM=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 8845a26..26f5249 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -311,11 +311,9 @@ CONFIG_TRANZPORT=m CONFIG_TWL4030_CORE=y CONFIG_TWL4030_POWER=y CONFIG_TWL4030_USB=y -CONFIG_UIO=m CONFIG_ULTRIX_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_USBIP_CORE=m # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -334,6 +332,7 @@ CONFIG_USB_INVENTRA_DMA=y CONFIG_USB_KC2190=y # CONFIG_USB_M66592 is not set CONFIG_USB_MON=m +CONFIG_USB_MUSB_HDRC=y CONFIG_USB_MUSB_OMAP2PLUS=y # CONFIG_USB_MUSB_TUSB6010 is not set # CONFIG_USB_NET2272 is not set @@ -342,17 +341,14 @@ CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_USB_OTG=y # CONFIG_USB_R8A66597 is not set CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_SERIAL_DEBUG=m # CONFIG_USB_SERIAL_SAFE_PADDED is not set CONFIG_USB_SI470X=m # CONFIG_USB_SN9C102 is not set CONFIG_VERSION_SIGNATURE="" -CONFIG_VETH=m CONFIG_VFAT_FS=y # CONFIG_VGASTATE is not set CONFIG_VIDEO_ADV7343=m # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_VIDEO_SAA7191=m CONFIG_VIDEO_TCM825X=m CONFIG_VIDEO_THS7303=m @@ -371,19 +367,11 @@ CONFIG_VLAN_8021Q_GVRP=y # 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_X25_ASY is not set -CONFIG_XFRM_USER=m CONFIG_XFS_RT=y -CONFIG_XVMALLOC=y -CONFIG_XZ_DEC_TEST=m -CONFIG_ZD1211RW=m CONFIG_ZLIB_DEFLATE=m CONFIG_ZONE_DMA_FLAG=0 -CONFIG_ZRAM=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index c39a416..7f6c37a 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -111,7 +111,7 @@ CONFIG_TWL4030_USB=y # CONFIG_USB_ARCH_HAS_XHCI is not set # CONFIG_USB_EHCI_TT_NEWSCHED is not set # CONFIG_USB_ET61X251 is not set -# CONFIG_USB_FUSB300 is not set +CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DWC3 is not set CONFIG_USB_GADGET_MUSB_HDRC=y CONFIG_USB_G_MULTI=m @@ -143,10 +143,8 @@ CONFIG_VIDEO_TVP514X=m # CONFIG_VIRTIO_NET is not set # CONFIG_VIRTIO_PCI is not set # CONFIG_VIRTIO_RING is not set -# CONFIG_VT6656 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_W35UND=m # CONFIG_WM8350_WATCHDOG is not set # CONFIG_X25_ASY is not set CONFIG_ZLIB_DEFLATE=m diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index 4f7460c..6e19abf 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -207,36 +207,26 @@ CONFIG_SWP_EMULATE=y # CONFIG_TCP_MD5SIG is not set # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set # CONFIG_TWL4030_POWER 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_ANNOUNCE_NEW_DEVICES=y # CONFIG_USB_ARCH_HAS_EHCI is not set # CONFIG_USB_ARCH_HAS_OHCI is not set CONFIG_USB_DYNAMIC_MINORS=y -# CONFIG_USB_GADGET is not set +CONFIG_USB_FUSB300=y CONFIG_USB_GPIO_VBUS=m CONFIG_USB_ISP1362_HCD=m # CONFIG_USB_KC2190 is not set +# CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_SERIAL_DEBUG is not set CONFIG_USB_SERIAL_SAFE_PADDED=y 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_W35UND is not set +CONFIG_VT6656=m # 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_XVMALLOC is not set -# CONFIG_XZ_DEC_TEST is not set -# CONFIG_ZD1211RW is not set -# CONFIG_ZRAM is not set diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index 0d57a90..dd10f6e 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -207,36 +207,26 @@ CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m CONFIG_TWL4030_POWER=y -CONFIG_UIO=m CONFIG_ULTRIX_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_USBIP_CORE=m # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_OHCI=y # CONFIG_USB_DYNAMIC_MINORS is not set -CONFIG_USB_GADGET=y +# CONFIG_USB_FUSB300 is not set CONFIG_USB_GPIO_VBUS=y # CONFIG_USB_ISP1362_HCD is not set CONFIG_USB_KC2190=y +CONFIG_USB_MUSB_HDRC=y CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_SERIAL_DEBUG=m # CONFIG_USB_SERIAL_SAFE_PADDED is not set CONFIG_VERSION_SIGNATURE="" -CONFIG_VETH=m -CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_VIRT_DRIVERS=y CONFIG_VLAN_8021Q_GVRP=y -CONFIG_W35UND=m +# CONFIG_VT6656 is not set 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_XVMALLOC=y -CONFIG_XZ_DEC_TEST=m -CONFIG_ZD1211RW=m -CONFIG_ZRAM=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index a3aeb5b..8433242 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5337,6 +5337,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 @@ -5351,6 +5352,7 @@ CONFIG_ULTRAMCA=m CONFIG_UNIX=y CONFIG_UNIX98_PTYS=y CONFIG_USB=y +CONFIG_USBIP_CORE=m # CONFIG_USBIP_DEBUG is not set CONFIG_USBIP_HOST=m CONFIG_USBIP_VHCI_HCD=m @@ -5495,7 +5497,6 @@ CONFIG_USB_MIDI_GADGET=m CONFIG_USB_MOUSE=m CONFIG_USB_MR800=m # CONFIG_USB_MUSB_AM35X is not set -CONFIG_USB_MUSB_HDRC=y CONFIG_USB_NET2272_DMA=y CONFIG_USB_NET2280=m CONFIG_USB_NET_AX8817X=m @@ -5545,6 +5546,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 @@ -5673,6 +5675,7 @@ CONFIG_V4L2_MEM2MEM_DEV=m CONFIG_V4L_MEM2MEM_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 @@ -5763,6 +5766,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 @@ -5876,6 +5880,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m CONFIG_WAFER_WDT=m CONFIG_WANXL=m +CONFIG_WAN_ROUTER=m CONFIG_WAN_ROUTER_DRIVERS=m CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -5902,9 +5907,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_SDIO_TEST is not set @@ -6025,6 +6032,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 @@ -6038,6 +6046,7 @@ CONFIG_XO1_RFKILL=m CONFIG_XOR_BLOCKS=m CONFIG_XPS=y CONFIG_XPS_USB_HCD_XILINX=y +CONFIG_XVMALLOC=y CONFIG_XZ_DEC=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_ARMTHUMB=y @@ -6045,6 +6054,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 @@ -6057,10 +6067,12 @@ CONFIG_YENTA_TOSHIBA=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZCACHE=m +CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_ZEROPLUS_FF=y CONFIG_ZISOFS=y CONFIG_ZLIB_INFLATE=y CONFIG_ZNET=m CONFIG_ZONE_DMA=y +CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 5f7f6db..c004ab4 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -326,11 +326,9 @@ CONFIG_TPS65010=m CONFIG_TRANZPORT=m # CONFIG_TWL4030_CORE is not set CONFIG_TWL4030_USB=m -CONFIG_UIO=m CONFIG_ULTRIX_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_USBIP_CORE=m # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -360,18 +358,15 @@ CONFIG_USB_NET2272=m # CONFIG_USB_OTG is not set CONFIG_USB_R8A66597=m CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_SERIAL_DEBUG=m # CONFIG_USB_SERIAL_SAFE_PADDED is not set CONFIG_USB_SI470X=m CONFIG_USB_SN9C102=m CONFIG_VERSION_SIGNATURE="" -CONFIG_VETH=m CONFIG_VFAT_FS=m CONFIG_VGASTATE=m CONFIG_VGA_ARB_MAX_GPUS=16 # CONFIG_VIDEO_ADV7343 is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -CONFIG_VIDEO_OUTPUT_CONTROL=m # CONFIG_VIDEO_SAA7191 is not set # CONFIG_VIDEO_TCM825X is not set # CONFIG_VIDEO_TDA9875 is not set @@ -392,12 +387,9 @@ 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_X25_ASY=m CONFIG_X86_32=y @@ -406,12 +398,7 @@ CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_MINIMUM_CPU_FAMILY=5 CONFIG_X86_SPEEDSTEP_LIB=y # CONFIG_X86_X2APIC is not set -CONFIG_XFRM_USER=m CONFIG_XFS_RT=y -CONFIG_XVMALLOC=y -CONFIG_XZ_DEC_TEST=m -CONFIG_ZD1211RW=m CONFIG_ZLIB_DEFLATE=m # CONFIG_ZONE_DMA32 is not set CONFIG_ZONE_DMA_FLAG=1 -CONFIG_ZRAM=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 289a088..94ca3ac 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -317,11 +317,9 @@ CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m # CONFIG_TRANZPORT is not set CONFIG_TWL4030_CORE=y CONFIG_TWL4030_USB=m -CONFIG_UIO=m CONFIG_ULTRIX_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_USBIP_CORE=m # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -350,18 +348,15 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y # CONFIG_USB_OTG is not set CONFIG_USB_R8A66597=m CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_SERIAL_DEBUG=m # CONFIG_USB_SERIAL_SAFE_PADDED is not set # CONFIG_USB_SI470X is not set CONFIG_USB_SN9C102=m CONFIG_VERSION_SIGNATURE="" -CONFIG_VETH=m CONFIG_VFAT_FS=m CONFIG_VGASTATE=m CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_VIDEO_ADV7343=m # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_VIDEO_SAA7191=m CONFIG_VIDEO_TCM825X=m CONFIG_VIDEO_TDA9875=m @@ -382,18 +377,10 @@ CONFIG_VLAN_8021Q_GVRP=y CONFIG_VT_HW_CONSOLE_BINDING=y # CONFIG_W35UND is not set 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_X25_ASY=m -CONFIG_XFRM_USER=m CONFIG_XFS_RT=y -CONFIG_XVMALLOC=y -CONFIG_XZ_DEC_TEST=m -CONFIG_ZD1211RW=m CONFIG_ZONE_DMA_FLAG=1 -CONFIG_ZRAM=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index a3709a4..ad67f76 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -350,11 +350,9 @@ CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m # CONFIG_TRANZPORT is not set CONFIG_TWL4030_CORE=y CONFIG_TWL4030_USB=m -CONFIG_UIO=m CONFIG_ULTRIX_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_USBIP_CORE=m # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -383,18 +381,15 @@ CONFIG_USB_OHCI_HCD_PPC_OF_LE=y # CONFIG_USB_OTG is not set CONFIG_USB_R8A66597=m CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_SERIAL_DEBUG=m # CONFIG_USB_SERIAL_SAFE_PADDED is not set # CONFIG_USB_SI470X is not set CONFIG_USB_SN9C102=m CONFIG_VERSION_SIGNATURE="" -CONFIG_VETH=m CONFIG_VFAT_FS=m CONFIG_VGASTATE=m CONFIG_VGA_ARB_MAX_GPUS=64 CONFIG_VIDEO_ADV7343=m # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_VIDEO_SAA7191=m CONFIG_VIDEO_TCM825X=m CONFIG_VIDEO_TDA9875=m @@ -415,20 +410,12 @@ CONFIG_VLAN_8021Q_GVRP=y CONFIG_VT_HW_CONSOLE_BINDING=y # CONFIG_W35UND is not set 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_X25_ASY=m -CONFIG_XFRM_USER=m CONFIG_XFS_RT=y -CONFIG_XVMALLOC=y -CONFIG_XZ_DEC_TEST=m -CONFIG_ZD1211RW=m CONFIG_ZLIB_DEFLATE=y CONFIG_ZONE_DMA_FLAG=1 -CONFIG_ZRAM=m -- 1.7.9.5