LINARO: update configs after merging linux-linaro-3.4-2012.05.1linaro-ubuntu-sauce-packaging-topic

Signed-off-by: John Rigby <jcrigby@jcrigby-laptop.(none)>

3 files changed, 60 insertions, 2 deletions

diff --git a/debian.linaro/config/armel/config.flavour.linaro-exynos b/debian.linaro/config/armel/config.flavour.linaro-exynos
index 0b32e52eaa3..771f5dc6a17 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-exynos
+++ b/debian.linaro/config/armel/config.flavour.linaro-exynos
@@ -30,7 +30,7 @@ CONFIG_CPU_IDLE=y
 CONFIG_DEBUG_PREEMPT=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DMADEVICES=y
-# CONFIG_DMA_SHARED_BUFFER is not set
+CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DRM is not set
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_FB_MODE_HELPERS is not set
diff --git a/debian.linaro/config/armhf/config.flavour.linaro-exynos b/debian.linaro/config/armhf/config.flavour.linaro-exynos
index 0b32e52eaa3..771f5dc6a17 100644
--- a/debian.linaro/config/armhf/config.flavour.linaro-exynos
+++ b/debian.linaro/config/armhf/config.flavour.linaro-exynos
@@ -30,7 +30,7 @@ CONFIG_CPU_IDLE=y
 CONFIG_DEBUG_PREEMPT=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DMADEVICES=y
-# CONFIG_DMA_SHARED_BUFFER is not set
+CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DRM is not set
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_FB_MODE_HELPERS is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index b4c7435e293..2ca5f2ec743 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -17,6 +17,7 @@ CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_AMD_PHY is not set
 # CONFIG_AMIGA_PARTITION is not set
 # CONFIG_ANDROID is not set
+# CONFIG_ANDROID_PARANOID_NETWORK is not set
 CONFIG_ANON_INODES=y
 # CONFIG_APDS9802ALS is not set
 # CONFIG_APM_EMULATION is not set
@@ -112,6 +113,7 @@ CONFIG_ARM_ERRATA_720789=y
 # CONFIG_ARM_ERRATA_754327 is not set
 # CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
 CONFIG_ARM_EXYNOS_CPUFREQ=y
+# CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART is not set
 CONFIG_ARM_GIC=y
 # CONFIG_ARM_KPROBES_TEST is not set
 CONFIG_ARM_L1_CACHE_SHIFT=6
@@ -137,6 +139,8 @@ CONFIG_ATA_BMDMA=y
 CONFIG_ATA_SFF=y
 CONFIG_ATA_VERBOSE_ERROR=y
 # CONFIG_ATH6KL_DEBUG is not set
+CONFIG_ATH6KL_PLATFORM_DATA=y
+# CONFIG_ATH6KL_POLL is not set
 # CONFIG_ATH6KL_SDIO is not set
 # CONFIG_ATH6KL_USB is not set
 # CONFIG_ATH9K is not set
@@ -196,6 +200,7 @@ CONFIG_BASE_SMALL=0
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_BCMA is not set
 CONFIG_BCMA_POSSIBLE=y
+# CONFIG_BCMDHD is not set
 # CONFIG_BCM_WIMAX is not set
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
@@ -282,6 +287,7 @@ CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_CEPH_FS is not set
 # CONFIG_CEPH_LIB is not set
+# CONFIG_CFG80211_ALLOW_RECONNECT is not set
 # CONFIG_CFG80211_DEBUGFS is not set
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -314,6 +320,16 @@ CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_DBX500_PRCMU=y
 CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK=y
 CONFIG_CLKSRC_MMIO=y
+# CONFIG_CLK_REG_CPUFREQ_DRIVER is not set
+CONFIG_CMA=y
+CONFIG_CMA_ALIGNMENT=8
+CONFIG_CMA_AREAS=7
+# CONFIG_CMA_DEBUG is not set
+CONFIG_CMA_SIZE_MBYTES=16
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
@@ -338,11 +354,13 @@ CONFIG_CPU_CP15_MMU=y
 # CONFIG_CPU_DCACHE_DISABLE is not set
 CONFIG_CPU_EXYNOS4210=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+# CONFIG_CPU_FREQ_GOV_INTERACTIVE is not set
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@@ -453,6 +471,7 @@ CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CS89x0 is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_DCB is not set
+# CONFIG_DCC_TTY is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
@@ -483,6 +502,7 @@ CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_DEBUG_PI_LIST=y
+# CONFIG_DEBUG_RODATA is not set
 # CONFIG_DEBUG_S3C_UART0 is not set
 # CONFIG_DEBUG_S3C_UART1 is not set
 # CONFIG_DEBUG_S3C_UART2 is not set
@@ -521,6 +541,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_DEVKMEM is not set
+CONFIG_DEVMEM=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
@@ -604,6 +625,7 @@ CONFIG_EXTRA_FIRMWARE=""
 CONFIG_EXYNOS4_DEV_AHCI=y
 CONFIG_EXYNOS4_DEV_DMA=y
 CONFIG_EXYNOS4_DEV_SYSMMU=y
+CONFIG_EXYNOS4_DEV_TMU=y
 CONFIG_EXYNOS4_DEV_USB_OHCI=y
 CONFIG_EXYNOS4_MCT=y
 # CONFIG_EXYNOS4_SDHCI_CH0_8BIT is not set
@@ -628,6 +650,7 @@ CONFIG_FAT_FS=y
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_FB=y
 CONFIG_FB_ARMCLCD=y
+# CONFIG_FB_ARMHDLCD is not set
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
 # CONFIG_FB_BROADSHEET is not set
@@ -659,6 +682,7 @@ CONFIG_FB_S3C=y
 # CONFIG_FB_WMT_GE_ROPS is not set
 # CONFIG_FHANDLE is not set
 CONFIG_FILE_LOCKING=y
+# CONFIG_FIQ_DEBUGGER is not set
 CONFIG_FIRMWARE_IN_KERNEL=y
 # CONFIG_FIXED_PHY is not set
 CONFIG_FLATMEM=y
@@ -695,6 +719,7 @@ CONFIG_FUNCTION_TRACER=y
 CONFIG_FUTEX=y
 CONFIG_FW_LOADER=y
 # CONFIG_GAMEPORT is not set
+CONFIG_GATOR=m
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_GENERIC_ACL=y
 CONFIG_GENERIC_BUG=y
@@ -739,6 +764,7 @@ CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_MTU=y
+# CONFIG_HAS_WAKELOCK is not set
 CONFIG_HAVE_AOUT=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_KGDB=y
@@ -749,6 +775,7 @@ CONFIG_HAVE_BPF_JIT=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FUNCTION_TRACER=y
@@ -950,11 +977,14 @@ CONFIG_INPUT=y
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_FF_MEMLESS is not set
 # CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO is not set
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 # CONFIG_INPUT_GPIO_TILT_POLLED is not set
 CONFIG_INPUT_JOYDEV=y
 # CONFIG_INPUT_JOYSTICK is not set
 CONFIG_INPUT_KEYBOARD=y
+# CONFIG_INPUT_KEYCHORD is not set
+# CONFIG_INPUT_KEYRESET is not set
 # CONFIG_INPUT_KEYSPAN_REMOTE is not set
 # CONFIG_INPUT_KXTJ9 is not set
 # CONFIG_INPUT_MAX8997_HAPTIC is not set
@@ -977,6 +1007,7 @@ CONFIG_INPUT_TWL4030_PWRBUTTON=y
 CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_YEALINK is not set
 CONFIG_IOMMU_SUPPORT=y
+# CONFIG_ION is not set
 CONFIG_IOSCHED_CFQ=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_NOOP=y
@@ -1115,6 +1146,7 @@ CONFIG_LCD_CLASS_DEVICE=y
 # CONFIG_LCD_LMS283GF05 is not set
 # CONFIG_LCD_LTV350QV is not set
 CONFIG_LCD_PLATFORM=y
+# CONFIG_LCD_PWRCTRL is not set
 # CONFIG_LCD_S6E63M0 is not set
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
@@ -1239,6 +1271,7 @@ CONFIG_MACH_UX500_DT=y
 # CONFIG_MACVLAN is not set
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MAGIC_SYSRQ=y
+# CONFIG_MALI400MP is not set
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
 # CONFIG_MAX8997_MUIC is not set
@@ -1306,6 +1339,7 @@ CONFIG_MFD_OMAP_USB_HOST=y
 # CONFIG_MICREL_KS8995MA is not set
 # CONFIG_MICREL_PHY is not set
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
+CONFIG_MIGRATION=y
 CONFIG_MII=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_MINIX_SUBPARTITION is not set
@@ -1313,11 +1347,14 @@ CONFIG_MMC=y
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set
 CONFIG_MMC_BLOCK_MINORS=8
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_DW is not set
+# CONFIG_MMC_EMBEDDED_SDIO is not set
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
+# CONFIG_MMC_PARANOID_SD_INIT is not set
 # CONFIG_MMC_SDHCI_PLTFM is not set
 # CONFIG_MMC_SDHCI_PXAV2 is not set
 # CONFIG_MMC_SDHCI_PXAV3 is not set
@@ -1456,6 +1493,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETWORK_SECMARK=y
 # CONFIG_NET_9P is not set
+# CONFIG_NET_ACTIVITY_STATS is not set
 # CONFIG_NET_CALXEDA_XGMAC is not set
 CONFIG_NET_CORE=y
 # CONFIG_NET_DMA is not set
@@ -1623,6 +1661,7 @@ CONFIG_PANEL_GENERIC_DPI=y
 # CONFIG_PANEL_SHARP_LS037V7DW01 is not set
 CONFIG_PANEL_TAAL=y
 # CONFIG_PANEL_TPO_TD043MTEA1 is not set
+CONFIG_PANIC_TIMEOUT=0
 # CONFIG_PANTHERLORD_FF is not set
 # CONFIG_PARPORT is not set
 CONFIG_PARTITION_ADVANCED=y
@@ -1756,6 +1795,7 @@ CONFIG_RELAY=y
 CONFIG_RFKILL_GPIO=y
 # CONFIG_RFKILL_INPUT is not set
 CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_PM=y
 # CONFIG_RFKILL_REGULATOR is not set
 CONFIG_RFS_ACCEL=y
 CONFIG_RING_BUFFER=y
@@ -1863,6 +1903,7 @@ CONFIG_S3C_DEV_I2C5=y
 CONFIG_S3C_DEV_I2C6=y
 CONFIG_S3C_DEV_I2C7=y
 CONFIG_S3C_DEV_RTC=y
+CONFIG_S3C_DEV_USB_HSOTG=y
 CONFIG_S3C_DEV_WDT=y
 CONFIG_S3C_GPIO_SPACE=0
 CONFIG_S3C_GPIO_TRACK=y
@@ -1874,6 +1915,7 @@ CONFIG_S5P_DEV_FIMC2=y
 CONFIG_S5P_DEV_FIMC3=y
 CONFIG_S5P_DEV_FIMD0=y
 CONFIG_S5P_DEV_G2D=y
+CONFIG_S5P_DEV_G3D=y
 CONFIG_S5P_DEV_I2C_HDMIPHY=y
 CONFIG_S5P_DEV_JPEG=y
 CONFIG_S5P_DEV_MFC=y
@@ -1966,6 +2008,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_ADT7462 is not set
 # CONFIG_SENSORS_ADT7470 is not set
 # CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_AK8975 is not set
 # CONFIG_SENSORS_AMC6821 is not set
 # CONFIG_SENSORS_APDS990X is not set
 # CONFIG_SENSORS_ASC7621 is not set
@@ -2138,6 +2181,7 @@ CONFIG_SND_RAWMIDI=m
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_SOC_ALL_CODECS is not set
+# CONFIG_SND_SOC_ORIGEN_ALC5625 is not set
 CONFIG_SND_SOC_SAMSUNG=y
 # CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF is not set
 # CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994 is not set
@@ -2215,7 +2259,10 @@ CONFIG_SUNRPC_GSS=y
 # CONFIG_SUN_PARTITION is not set
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_TIME is not set
+# CONFIG_SWITCH is not set
 CONFIG_SWP_EMULATE=y
+# CONFIG_SYNC is not set
 CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 CONFIG_SYSCTL_SYSCALL=y
@@ -2279,6 +2326,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m
 # CONFIG_TOUCHSCREEN_PIXCIR is not set
 # CONFIG_TOUCHSCREEN_ST1232 is not set
 # CONFIG_TOUCHSCREEN_STMPE is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI is not set
 # CONFIG_TOUCHSCREEN_TI_TSCADC is not set
 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
@@ -2287,6 +2335,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_TSC_SERIO is not set
+# CONFIG_TOUCHSCREEN_UNIDISPLAY_TS is not set
 # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
 # CONFIG_TOUCHSCREEN_W90X900 is not set
 # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
@@ -2326,8 +2375,10 @@ CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_UFS_FS is not set
 CONFIG_UID16=y
+# CONFIG_UID_STAT is not set
 # CONFIG_UIO is not set
 # CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_UMP is not set
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_UNIX=y
 CONFIG_UNIX98_PTYS=y
@@ -2505,6 +2556,7 @@ CONFIG_USB_OTG_UTILS=y
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_S2255 is not set
+# CONFIG_USB_S3C_HSOTG is not set
 # CONFIG_USB_SERIAL is not set
 # CONFIG_USB_SEVSEG is not set
 # CONFIG_USB_SIERRA_NET is not set
@@ -2549,6 +2601,7 @@ CONFIG_USB_ZERO=m
 # CONFIG_USB_ZERO_HNPTEST is not set
 # CONFIG_USB_ZR364XX is not set
 # CONFIG_USER_NS is not set
+# CONFIG_USER_WAKELOCK is not set
 CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_USE_OF=y
 # CONFIG_UTS_NS is not set
@@ -2569,6 +2622,7 @@ CONFIG_VFPv3=y
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEOBUF2_CORE=y
 CONFIG_VIDEOBUF2_DMA_CONTIG=y
+CONFIG_VIDEOBUF2_FB=y
 CONFIG_VIDEOBUF2_MEMOPS=y
 # CONFIG_VIDEO_ADP1653 is not set
 # CONFIG_VIDEO_ADV7170 is not set
@@ -2689,6 +2743,7 @@ CONFIG_W1_CON=y
 # CONFIG_W1_SLAVE_SMEM is not set
 # CONFIG_W1_SLAVE_THERM is not set
 # CONFIG_W35UND is not set
+# CONFIG_WAKELOCK is not set
 # CONFIG_WAN is not set
 # CONFIG_WAN_ROUTER is not set
 CONFIG_WATCHDOG=y
@@ -2698,12 +2753,14 @@ CONFIG_WEXT_CORE=y
 CONFIG_WEXT_PRIV=y
 CONFIG_WEXT_PROC=y
 CONFIG_WEXT_SPY=y
+# CONFIG_WIFI_CONTROL_FUNC is not set
 # CONFIG_WIMAX is not set
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_WL1251=m
 CONFIG_WL1251_SDIO=m
 CONFIG_WL1251_SPI=m
+# CONFIG_WL127X_RFKILL is not set
 CONFIG_WL12XX=m
 CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX_PLATFORM_DATA=y
@@ -2727,6 +2784,7 @@ CONFIG_XZ_DEC_POWERPC=y
 CONFIG_XZ_DEC_SPARC=y
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_XZ_DEC_X86=y
+# CONFIG_YAFFS_FS is not set
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZD1211RW=m