summaryrefslogtreecommitdiffstats
path: root/config-armv7-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2014-06-16 13:25:03 +0100
committerPeter Robinson <pbrobinson@gmail.com>2014-06-16 13:25:03 +0100
commitb6e474380fd815ef2452ebb214438b749e57dfa8 (patch)
tree790141ab5250a3c403a45cdc86af0386a5d42a0c /config-armv7-generic
parent79d682febc2f96bbedb0e430773276dc48cefdc4 (diff)
downloadkernel-b6e474380fd815ef2452ebb214438b749e57dfa8.tar.gz
kernel-b6e474380fd815ef2452ebb214438b749e57dfa8.tar.xz
kernel-b6e474380fd815ef2452ebb214438b749e57dfa8.zip
ARM config updates for 3.16
Diffstat (limited to 'config-armv7-generic')
-rw-r--r--config-armv7-generic7
1 files changed, 3 insertions, 4 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index 07f8d8f0e..4199415dd 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -128,8 +128,7 @@ CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
CONFIG_IP_PNP_BOOTP=y
-# CONFIG_PCI_HOST_GENERIC is not set
-# CONFIG_BRCMSTB_GISB_ARB is not set
+CONFIG_PCI_HOST_GENERIC=y
# Root as NFS, different from mainline
CONFIG_ROOT_NFS=y
@@ -187,7 +186,7 @@ CONFIG_SPI_SUN6I=m
CONFIG_MMC_SUNXI=m
CONFIG_GPIO_PCA953X=m
CONFIG_POWER_RESET_SUN6I=y
-# CONFIG_TOUCHSCREEN_SUN4I is not set
+CONFIG_TOUCHSCREEN_SUN4I=m
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=m
@@ -664,7 +663,6 @@ CONFIG_BPF_JIT=y
# CONFIG_EZX_PCAP is not set
# Needs work/investigation
-# CONFIG_ARM_CHARLCD is not set
# CONFIG_MTD_AFS_PARTS is not set
# CONFIG_IP_PNP_RARP is not set
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
@@ -680,6 +678,7 @@ CONFIG_BPF_JIT=y
# CONFIG_SPI_FSL_DSPI is not set
# CONFIG_FB_XILINX is not set
# CONFIG_USB_S3C_HSOTG is not set
+# CONFIG_BRCMSTB_GISB_ARB is not set
# these modules all fail with missing __bad_udelay
# http://www.spinics.net/lists/arm/msg15615.html provides some background