kernel: Update to 3.6.6.

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

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index f51241e6a9338210aff706fa57a4de621a2e6259..e2e484cf70c60c5a04934e5b667b683d48e6f8da 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -15,8 +15,6 @@ CONFIG_BROKEN_ON_SMP=y
 # IRQ subsystem
 #
 CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_IRQ_DOMAIN=y
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_KTIME_SCALAR=y
 
 #
@@ -25,6 +23,11 @@ CONFIG_KTIME_SCALAR=y
 CONFIG_TINY_RCU=y
 CONFIG_PERF_USE_VMALLOC=y
 
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+
 #
 # GCOV-based kernel profiling
 #
@@ -38,6 +41,7 @@ CONFIG_LBDAF=y
 #
 # System Type
 #
+# CONFIG_ARCH_SOCFPGA is not set
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_REALVIEW is not set
 CONFIG_ARCH_VERSATILE=y
@@ -60,6 +64,7 @@ CONFIG_ARCH_VERSATILE=y
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_DOVE is not set
 # CONFIG_ARCH_KIRKWOOD is not set
 # CONFIG_ARCH_LPC32XX is not set
@@ -98,6 +103,7 @@ CONFIG_ARCH_VERSATILE=y
 CONFIG_ARCH_VERSATILE_PB=y
 CONFIG_MACH_VERSATILE_AB=y
 CONFIG_MACH_VERSATILE_DT=y
+CONFIG_PLAT_VERSATILE_CLOCK=y
 CONFIG_PLAT_VERSATILE_CLCD=y
 CONFIG_PLAT_VERSATILE_FPGA_IRQ=y
 CONFIG_PLAT_VERSATILE_FPGA_IRQ_NR=4
@@ -224,6 +230,7 @@ CONFIG_BPF_JIT=y
 # Generic Driver Options
 #
 # CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CMA is not set
 CONFIG_DTC=y
 CONFIG_OF=y
 
@@ -321,6 +328,7 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=m
 # CONFIG_HVC_DCC is not set
 CONFIG_HW_RANDOM_ATMEL=m
+CONFIG_HW_RANDOM_EXYNOS=m
 
 #
 # PC SMBus host controller drivers
@@ -335,6 +343,7 @@ CONFIG_I2C_SIS630=m
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+CONFIG_I2C_NOMADIK=m
 CONFIG_I2C_VERSATILE=m
 
 #
@@ -371,12 +380,12 @@ CONFIG_OF_GPIO=y
 # CONFIG_MFD_TC6393XB is not set
 
 #
-# Customize TV tuners
+# Media drivers
 #
 CONFIG_VIDEOBUF2_DMA_CONTIG=m
 
 #
-# Miscelaneous helper chips
+# Webcam and/or TV USB devices
 #
 CONFIG_VIDEO_CAFE_CCIC=m
 # CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
@@ -416,6 +425,7 @@ CONFIG_FB_ARMCLCD=m
 CONFIG_SND_ARM=y
 CONFIG_SND_ARMAACI=m
 CONFIG_SND_SOC=m
+CONFIG_SND_DESIGNWARE_I2S=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ALL_CODECS is not set
 CONFIG_SND_SIMPLE_CARD=m
@@ -441,6 +451,11 @@ CONFIG_MMC_DW_PCI=m
 #
 # CONFIG_LEDS_RENESAS_TPU is not set
 
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_EDAC is not set
+
 #
 # on-CPU RTC drivers
 #
@@ -454,6 +469,12 @@ CONFIG_RTC_DRV_PL031=m
 # CONFIG_DW_DMAC is not set
 CONFIG_PL330_DMA=y
 
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_DEBUG is not set
+
 #
 # Android
 #
@@ -463,6 +484,7 @@ CONFIG_CLKDEV_LOOKUP=y
 # Hardware Spinlock drivers
 #
 CONFIG_CLKSRC_MMIO=y
+CONFIG_OF_IOMMU=y
 
 #
 # Pseudo filesystems