summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2013-02-28 00:32:46 +0000
committerPeter Robinson <pbrobinson@gmail.com>2013-02-28 00:32:46 +0000
commita9221ac3f8a15e9f0c46cd450ba68c540104cd4a (patch)
treedbfa8f2284eb6e18b9ffcb34aeb160e5ca4f8ead /config-armv7
parent951b84adc88a9555e423b57bbf1bdc777a191817 (diff)
downloadkernel-a9221ac3f8a15e9f0c46cd450ba68c540104cd4a.tar.gz
kernel-a9221ac3f8a15e9f0c46cd450ba68c540104cd4a.tar.xz
kernel-a9221ac3f8a15e9f0c46cd450ba68c540104cd4a.zip
- Drop ARM kirkwood kernel
- Enable SPI on ARM - General 3.9 updates
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv726
1 files changed, 13 insertions, 13 deletions
diff --git a/config-armv7 b/config-armv7
index bd96560f6..445323ecd 100644
--- a/config-armv7
+++ b/config-armv7
@@ -110,6 +110,8 @@ CONFIG_HIGH_RES_TIMERS=y
CONFIG_SECCOMP=y
CONFIG_STRICT_DEVMEM=y
+CONFIG_XZ_DEC_ARM=y
+
CONFIG_PM=y
CONFIG_PM_STD_PARTITION=""
CONFIG_SUSPEND=y
@@ -124,10 +126,6 @@ CONFIG_CC_STACKPROTECTOR=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_UTS_NS is not set
-# CONFIG_IPC_NS is not set
-# CONFIG_PID_NS is not set
-# CONFIG_NET_NS is not set
CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
@@ -203,7 +201,6 @@ CONFIG_MVNETA=m
CONFIG_SATA_MV=m
CONFIG_MARVELL_PHY=m
CONFIG_RTC_DRV_S35390A=y
-CONFIG_USB_EHCI_MV=y
# Allwinner a1x
# CONFIG_SUNXI_RFKILL=y
@@ -241,8 +238,12 @@ CONFIG_USB_EHCI_MV=y
# CONFIG_MMC_SUNXI=y
# CONFIG_RTC_DRV_SUN4I=y
+# OMAP
+# CONFIG_DRM_TILCDC is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+
# imx
-CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_PWM is not set
# CONFIG_DRM_IMX is not set
# CONFIG_DRM_IMX_FB_HELPER=m
# CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
@@ -263,8 +264,8 @@ CONFIG_CRYPTO_DEV_PICOXCELL=m
# ST Ericsson
# CONFIG_I2C_NOMADIK is not set
-# OMAP
-# CONFIG_SENSORS_LIS3_I2C is not set
+# ZYNQ
+# CONFIG_LATTICE_ECP3_CONFIG is not set
# General ARM drivers
# Device tree
@@ -278,12 +279,15 @@ CONFIG_ARM_APPENDED_DTB=y
CONFIG_PROC_DEVICETREE=y
# CONFIG_OF_SELFTEST is not set
CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_OF_GPIO=y
CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y
+CONFIG_OF_GPIO=y
CONFIG_I2C_MUX_PINCTRL=m
CONFIG_OF_MDIO=m
+CONFIG_OF_DISPLAY_TIMING=y
+CONFIG_OF_VIDEOMODE=y
+
CONFIG_MDIO_BUS_MUX_GPIO=m
CONFIG_GPIOLIB=y
@@ -469,8 +473,4 @@ CONFIG_VIRTUALIZATION=y
# CONFIG_ARM_HIGHBANK_CPUFREQ is not set
# CONFIG_RFKILL_REGULATOR is not set
-CONFIG_DRM_TILCDC=m
-CONFIG_OF_DISPLAY_TIMING=y
-CONFIG_OF_VIDEOMODE=y
-
CONFIG_XZ_DEC_ARM=y