kernel: Update to 3.9.3.

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

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 7527060fef766dc3655d3d2508d01e05096278ee..506dd53cbb5a590b4b39a8c21e613ec9f7d8a884 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -14,6 +14,7 @@ CONFIG_BROKEN_ON_SMP=y
 # IRQ subsystem
 #
 CONFIG_HARDIRQS_SW_RESEND=y
+# CONFIG_ALWAYS_USE_PERSISTENT_CLOCK is not set
 CONFIG_KTIME_SCALAR=y
 
 #
@@ -25,6 +26,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 # RCU Subsystem
 #
 CONFIG_TINY_RCU=y
+# CONFIG_RCU_STALL_COMMON is not set
 CONFIG_PERF_USE_VMALLOC=y
 
 #
@@ -33,6 +35,7 @@ CONFIG_PERF_USE_VMALLOC=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGACTION=y
 
 #
 # GCOV-based kernel profiling
@@ -88,8 +91,7 @@ CONFIG_ARCH_VERSATILE=y
 # CONFIG_ARCH_NOMADIK is not set
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VT8500_SINGLE is not set
+# CONFIG_ARCH_OMAP1 is not set
 
 #
 # Versatile platform type
@@ -101,7 +103,6 @@ CONFIG_PLAT_VERSATILE_CLOCK=y
 CONFIG_PLAT_VERSATILE_CLCD=y
 CONFIG_PLAT_VERSATILE_LEDS=y
 CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y
-# CONFIG_ARCH_VT8500 is not set
 CONFIG_PLAT_VERSATILE=y
 CONFIG_ARM_TIMER_SP804=y
 
@@ -132,8 +133,6 @@ CONFIG_ARM_THUMB=y
 CONFIG_ARM_L1_CACHE_SHIFT=5
 CONFIG_ARM_NR_BANKS=8
 CONFIG_MULTI_IRQ_HANDLER=y
-CONFIG_ARM_VIC=y
-CONFIG_ARM_VIC_NR=2
 CONFIG_ICST=y
 
 #
@@ -160,7 +159,6 @@ CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
 # CONFIG_HIGHPTE is not set
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=999999
@@ -204,7 +202,6 @@ CONFIG_VFP=y
 # Power management options
 #
 CONFIG_APM_EMULATION=y
-CONFIG_PM_CLK=y
 CONFIG_CPU_PM=y
 CONFIG_ARM_CPU_SUSPEND=y
 
@@ -252,7 +249,6 @@ CONFIG_OF_PCI_IRQ=y
 # Misc devices
 #
 # CONFIG_SENSORS_LIS3LV02D is not set
-# CONFIG_ATMEL_PWM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_ARM_CHARLCD is not set
 
@@ -260,7 +256,6 @@ CONFIG_OF_PCI_IRQ=y
 # SCSI Transports
 #
 # CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_NSP32 is not set
 
 #
@@ -304,7 +299,6 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
 #
 # Input Device Drivers
 #
-# CONFIG_KEYBOARD_SAMSUNG is not set
 CONFIG_INPUT_PWM_BEEPER=m
 
 #
@@ -326,8 +320,6 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_HVC_DCC is not set
-CONFIG_HW_RANDOM_ATMEL=m
-CONFIG_HW_RANDOM_EXYNOS=m
 
 #
 # PC SMBus host controller drivers
@@ -367,6 +359,7 @@ CONFIG_GPIO_ADNP=m
 #
 # CONFIG_APM_POWER is not set
 CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_RESTART=y
 
 #
 # Watchdog Device Drivers
@@ -392,17 +385,18 @@ CONFIG_VIDEO_CAFE_CCIC=m
 # CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
 # CONFIG_VIDEO_SH_MOBILE_CEU is not set
 
-#
-# Graphics support
-#
-# CONFIG_DRM_RADEON is not set
-# CONFIG_DRM_NOUVEAU is not set
-
 #
 # I2C encoder or helper chips
 #
 CONFIG_DRM_I2C_CH7006=m
 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
@@ -429,6 +423,7 @@ CONFIG_SND_COMPRESS_OFFLOAD=m
 CONFIG_SND_ARM=y
 CONFIG_SND_ARMAACI=m
 CONFIG_SND_SOC=m
+CONFIG_SND_ATMEL_SOC=m
 CONFIG_SND_DESIGNWARE_I2S=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ALL_CODECS is not set
@@ -443,8 +438,6 @@ CONFIG_SND_SIMPLE_CARD=m
 # MMC/SD/SDIO Host Controller Drivers
 #
 CONFIG_MMC_ARMMMCI=m
-CONFIG_MMC_SDHCI_PXAV3=m
-CONFIG_MMC_SDHCI_PXAV2=m
 CONFIG_MMC_DW=m
 # CONFIG_MMC_DW_IDMAC is not set
 CONFIG_MMC_DW_PLTFM=m
@@ -454,12 +447,15 @@ CONFIG_MMC_DW_PCI=m
 #
 # LED drivers
 #
-# CONFIG_LEDS_RENESAS_TPU is not set
+CONFIG_LEDS_PWM=m
 
 #
 # iptables trigger is under Netfilter config (LED target)
 #
 # CONFIG_EDAC is not set
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 
 #
 # on-CPU RTC drivers
@@ -474,22 +470,22 @@ CONFIG_RTC_DRV_SNVS=m
 # CONFIG_AMBA_PL08X is not set
 # CONFIG_DW_DMAC is not set
 CONFIG_PL330_DMA=y
-
-#
-# Android
-#
-CONFIG_CLKDEV_LOOKUP=y
+CONFIG_DMA_OF=y
 
 #
 # Hardware Spinlock drivers
 #
 CONFIG_CLKSRC_MMIO=y
+CONFIG_PL320_MBOX=y
 CONFIG_OF_IOMMU=y
 
 #
-# Rpmsg drivers (EXPERIMENTAL)
+# Magnetometer sensors
 #
 CONFIG_PWM=y
+CONFIG_IRQCHIP=y
+CONFIG_ARM_VIC=y
+CONFIG_ARM_VIC_NR=2
 CONFIG_VERSATILE_FPGA_IRQ=y
 CONFIG_VERSATILE_FPGA_IRQ_NR=4
 
@@ -497,6 +493,10 @@ CONFIG_VERSATILE_FPGA_IRQ_NR=4
 # Kernel hacking
 #
 # CONFIG_DEBUG_HIGHMEM is not set
+
+#
+# RCU Debugging
+#
 # CONFIG_FTRACE_SYSCALLS is not set
 CONFIG_ARM_UNWIND=y
 CONFIG_OLD_MCOUNT=y
@@ -557,3 +557,4 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 #
 CONFIG_AUDIT_GENERIC=y
 CONFIG_GENERIC_ATOMIC64=y
+# CONFIG_VIRTUALIZATION is not set