summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-09-04 09:04:21 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2013-09-04 09:04:21 -0400
commit9aa82fd6d24ef1108c758ccd122dce97b2245e72 (patch)
treeda0629ecf3ff5270a87a4feb2a9a00f056ecf0cf /config-armv7
parent56937f61af5d0870816f73166305919233f9270f (diff)
downloadkernel-9aa82fd6d24ef1108c758ccd122dce97b2245e72.tar.gz
kernel-9aa82fd6d24ef1108c758ccd122dce97b2245e72.tar.xz
kernel-9aa82fd6d24ef1108c758ccd122dce97b2245e72.zip
Linux v3.11-2455-g40031da
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv73
1 files changed, 2 insertions, 1 deletions
diff --git a/config-armv7 b/config-armv7
index 5d171c819..b703a7882 100644
--- a/config-armv7
+++ b/config-armv7
@@ -85,6 +85,7 @@ CONFIG_MACH_OMAP3530_LV_SOM=y
CONFIG_MACH_OMAP3_TORPEDO=y
CONFIG_MACH_OVERO=y
CONFIG_MACH_OMAP3EVM=y
+CONFIG_NOP_USB_XCEIV=y
CONFIG_MACH_OMAP3517EVM=y
CONFIG_MACH_CRANEBOARD=y
CONFIG_MACH_OMAP3_PANDORA=y
@@ -547,7 +548,7 @@ CONFIG_SERIO_OLPC_APSP=m
CONFIG_SERIAL_XILINX_PS_UART=y
CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
CONFIG_COMMON_CLK_AXI_CLKGEN=m
-CONFIG_CPU_IDLE_ZYNQ=y
+CONFIG_ARM_ZYNQ_CPUIDLE=y
CONFIG_LATTICE_ECP3_CONFIG=m
CONFIG_NET_VENDOR_XILINX=y
CONFIG_XILINX_EMACLITE=m