kernel: Update to 3.10.9.

[people/ms/ipfire-3.x.git] / kernel / config-arm-generic

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 6baebb4bec8865a706a8d999c9b7f0f64574524f..610bbfe7bfef0a7f61ac43c56c887915fda7310e 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -16,10 +16,16 @@ CONFIG_BROKEN_ON_SMP=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_KTIME_SCALAR=y
 
+#
+# Timers subsystem
+#
+CONFIG_NO_HZ_IDLE=y
+
 #
 # CPU/Task time and stats accounting
 #
 CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
 
 #
 # RCU Subsystem
@@ -31,6 +37,7 @@ CONFIG_PERF_USE_VMALLOC=y
 #
 # Kernel Performance Events And Counters
 #
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_CLONE_BACKWARDS=y
@@ -49,17 +56,12 @@ CONFIG_LBDAF=y
 # CONFIG_ARCH_REALVIEW is not set
 CONFIG_ARCH_VERSATILE=y
 # CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCM2835 is not set
-# CONFIG_ARCH_CNS3XXX is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_SIRF is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_MXS is not set
 # CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
@@ -72,7 +74,6 @@ CONFIG_ARCH_VERSATILE=y
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCH_LPC32XX is not set
-# CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_MSM is not set
 # CONFIG_ARCH_SHMOBILE is not set
@@ -86,11 +87,9 @@ CONFIG_ARCH_VERSATILE=y
 # CONFIG_ARCH_EXYNOS is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_U8500 is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP1 is not set
+# CONFIG_PLAT_SPEAR is not set
 
 #
 # Versatile platform type
@@ -128,6 +127,8 @@ CONFIG_ARM_THUMB=y
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 # CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+CONFIG_NEED_KUSER_HELPERS=y
+CONFIG_KUSER_HELPERS=y
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_ARM_L1_CACHE_SHIFT=5
 CONFIG_ARM_NR_BANKS=8
@@ -295,6 +296,11 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
 #
 # CONFIG_ISDN_DRV_LOOP is not set
 
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_APMPOWER is not set
+
 #
 # Input Device Drivers
 #
@@ -304,6 +310,7 @@ CONFIG_INPUT_PWM_BEEPER=m
 # Hardware I/O ports
 #
 CONFIG_SERIO_AMBAKMI=m
+CONFIG_SERIO_APBPS2=m
 
 #
 # Serial drivers
@@ -347,6 +354,8 @@ CONFIG_OF_GPIO=y
 #
 # CONFIG_GPIO_EM is not set
 # CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_RCAR is not set
+# CONFIG_GPIO_GRGPIO is not set
 
 #
 # I2C GPIO expanders:
@@ -375,7 +384,6 @@ CONFIG_POWER_RESET_RESTART=y
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_SYSCON is not set
 
 #
 # Media digital TV PCI Adapters
@@ -384,6 +392,11 @@ CONFIG_VIDEO_CAFE_CCIC=m
 # CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
 # CONFIG_VIDEO_SH_MOBILE_CEU is not set
 
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV7670=m
+
 #
 # I2C encoder or helper chips
 #
@@ -392,31 +405,18 @@ CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_RADEON is not set
 # CONFIG_DRM_NOUVEAU is not set
 # CONFIG_DRM_TILCDC is not set
-CONFIG_DISPLAY_TIMING=y
-CONFIG_VIDEOMODE=y
-CONFIG_OF_DISPLAY_TIMING=y
-CONFIG_OF_VIDEOMODE=y
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_IMAGEBLIT=m
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-CONFIG_FB_SYS_FOPS=m
+# CONFIG_FB_BACKLIGHT is not set
 
 #
 # Frame buffer hardware drivers
 #
-CONFIG_FB_ARMCLCD=m
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_ARMCLCD is not set
 CONFIG_BACKLIGHT_PWM=m
 
 #
 # Console display driver support
 #
-CONFIG_FB_SSD1307=m
+# CONFIG_FB_SSD1307 is not set
 CONFIG_SND_COMPRESS_OFFLOAD=m
 # CONFIG_SND_ALI5451 is not set
 CONFIG_SND_ARM=y
@@ -428,11 +428,6 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ALL_CODECS is not set
 CONFIG_SND_SIMPLE_CARD=m
 
-#
-# OTG and related infrastructure
-#
-# CONFIG_USB_ULPI is not set
-
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
@@ -440,7 +435,7 @@ CONFIG_MMC_ARMMMCI=m
 CONFIG_MMC_DW=m
 # CONFIG_MMC_DW_IDMAC is not set
 CONFIG_MMC_DW_PLTFM=m
-# CONFIG_MMC_DW_EXYNOS is not set
+CONFIG_MMC_DW_EXYNOS=m
 CONFIG_MMC_DW_PCI=m
 
 #
@@ -471,10 +466,16 @@ CONFIG_DMA_OF=y
 #
 # Hardware Spinlock drivers
 #
+CONFIG_CLKSRC_OF=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_PL320_MBOX=y
 CONFIG_OF_IOMMU=y
 
+#
+# Analog to digital converters
+#
+# CONFIG_EXYNOS_ADC is not set
+
 #
 # Magnetometer sensors
 #
@@ -502,6 +503,7 @@ CONFIG_DEBUG_LL_UART_NONE=y
 # CONFIG_DEBUG_ICEDCC is not set
 # CONFIG_DEBUG_SEMIHOSTING is not set
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h"
 # CONFIG_OC_ETM is not set
 
 #
@@ -556,3 +558,4 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 #
 CONFIG_AUDIT_GENERIC=y
 CONFIG_GENERIC_ATOMIC64=y
+CONFIG_KVM_ARM_MAX_VCPUS=0