kernel: Update to 3.11.6.

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

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 610bbfe7bfef0a7f61ac43c56c887915fda7310e..e46625155e0aba228f928ec05edbeeb841626cbd 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -32,6 +32,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 #
 CONFIG_TINY_RCU=y
 # CONFIG_RCU_STALL_COMMON is not set
+CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_PERF_USE_VMALLOC=y
 
 #
@@ -86,7 +87,6 @@ CONFIG_ARCH_VERSATILE=y
 # CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_EXYNOS is not set
 # CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_U300 is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP1 is not set
 # CONFIG_PLAT_SPEAR is not set
@@ -143,6 +143,12 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
 
+#
+# PCI host controller drivers
+#
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+
 #
 # Kernel Features
 #
@@ -224,6 +230,7 @@ CONFIG_BPF_JIT=y
 #
 # Bus devices
 #
+CONFIG_ARM_CCI=y
 CONFIG_DTC=y
 CONFIG_OF=y
 
@@ -236,7 +243,6 @@ CONFIG_OF_FLATTREE=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_DEVICE=y
 CONFIG_OF_I2C=m
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=y
@@ -266,6 +272,7 @@ CONFIG_OF_PCI_IRQ=y
 #
 # Distributed Switch Architecture drivers
 #
+CONFIG_ARC_EMAC=m
 CONFIG_NET_VENDOR_CIRRUS=y
 CONFIG_CS89x0=m
 CONFIG_CS89x0_PLATFORM=y
@@ -280,8 +287,6 @@ CONFIG_AX88796=m
 CONFIG_AX88796_93CX6=y
 CONFIG_SMC91X=m
 CONFIG_SMC911X=m
-CONFIG_SMSC911X=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
 # CONFIG_SUNGEM is not set
 
 #
@@ -311,6 +316,7 @@ CONFIG_INPUT_PWM_BEEPER=m
 #
 CONFIG_SERIO_AMBAKMI=m
 CONFIG_SERIO_APBPS2=m
+# CONFIG_SERIO_OLPC_APSP is not set
 
 #
 # Serial drivers
@@ -368,6 +374,12 @@ CONFIG_GPIO_ADNP=m
 # CONFIG_APM_POWER is not set
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_RESTART=y
+CONFIG_POWER_RESET_VEXPRESS=y
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_VEXPRESS=m
 
 #
 # Watchdog Device Drivers
@@ -384,6 +396,7 @@ CONFIG_POWER_RESET_RESTART=y
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_MFD_TC6393XB is not set
+CONFIG_VEXPRESS_CONFIG=y
 
 #
 # Media digital TV PCI Adapters
@@ -397,6 +410,12 @@ CONFIG_VIDEO_CAFE_CCIC=m
 #
 CONFIG_VIDEO_OV7670=m
 
+#
+# Graphics support
+#
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+
 #
 # I2C encoder or helper chips
 #
@@ -404,7 +423,12 @@ CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_RADEON is not set
 # CONFIG_DRM_NOUVEAU is not set
+CONFIG_DRM_RCAR_DU=m
+CONFIG_DRM_SHMOBILE=m
 # CONFIG_DRM_TILCDC is not set
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_BACKLIGHT is not set
 
 #
@@ -436,6 +460,7 @@ CONFIG_MMC_DW=m
 # CONFIG_MMC_DW_IDMAC is not set
 CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_DW_EXYNOS=m
+# CONFIG_MMC_DW_SOCFPGA is not set
 CONFIG_MMC_DW_PCI=m
 
 #
@@ -477,9 +502,11 @@ CONFIG_OF_IOMMU=y
 # CONFIG_EXYNOS_ADC is not set
 
 #
-# Magnetometer sensors
+# Pressure Sensors
 #
 CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+CONFIG_PWM_PCA9685=m
 CONFIG_IRQCHIP=y
 CONFIG_ARM_VIC=y
 CONFIG_ARM_VIC_NR=2
@@ -487,7 +514,7 @@ CONFIG_VERSATILE_FPGA_IRQ=y
 CONFIG_VERSATILE_FPGA_IRQ_NR=4
 
 #
-# Kernel hacking
+# Memory Debugging
 #
 # CONFIG_DEBUG_HIGHMEM is not set
 
@@ -495,13 +522,14 @@ CONFIG_VERSATILE_FPGA_IRQ_NR=4
 # RCU Debugging
 #
 # CONFIG_FTRACE_SYSCALLS is not set
+
+#
+# Runtime Testing
+#
 CONFIG_ARM_UNWIND=y
 CONFIG_OLD_MCOUNT=y
 # CONFIG_DEBUG_USER is not set
-CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_LL_UART_NONE=y
-# CONFIG_DEBUG_ICEDCC is not set
-# CONFIG_DEBUG_SEMIHOSTING is not set
+# CONFIG_DEBUG_LL is not set
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h"
 # CONFIG_OC_ETM is not set
@@ -558,4 +586,3 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 #
 CONFIG_AUDIT_GENERIC=y
 CONFIG_GENERIC_ATOMIC64=y
-CONFIG_KVM_ARM_MAX_VCPUS=0