summaryrefslogtreecommitdiffstats
path: root/config-armv7-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-07-06 16:34:35 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-07-06 16:34:35 -0400
commit088a50c52e6f720fdbd321871fb3e30e241508c5 (patch)
tree1a71348d2e970f1d6f8a1f824935e54d64d00040 /config-armv7-generic
parent55b5c15b8f0c65f111c9fb61b839024d0502798c (diff)
downloadkernel-088a50c52e6f720fdbd321871fb3e30e241508c5.tar.gz
kernel-088a50c52e6f720fdbd321871fb3e30e241508c5.tar.xz
kernel-088a50c52e6f720fdbd321871fb3e30e241508c5.zip
Linux v4.2-rc1
- Disable debug options. - Add patch to fix perf build
Diffstat (limited to 'config-armv7-generic')
-rw-r--r--config-armv7-generic8
1 files changed, 2 insertions, 6 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index 5a24a4b58..4b8949804 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -161,14 +161,8 @@ CONFIG_SERIAL_AMBA_PL010=y
CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
CONFIG_RTC_DRV_PL030=y
-CONFIG_RTC_DRV_PL031=y
-
-CONFIG_PL330_DMA=m
CONFIG_AMBA_PL08X=y
-CONFIG_GPIO_PL061=y
-CONFIG_PL320_MBOX=y
CONFIG_SND_ARMAACI=m
-CONFIG_USB_ISP1760=m
CONFIG_EDAC=y
@@ -178,6 +172,7 @@ CONFIG_EDAC_HIGHBANK_L2=m
CONFIG_SATA_HIGHBANK=m
CONFIG_ARM_HIGHBANK_CPUFREQ=m
# CONFIG_ARM_HIGHBANK_CPUIDLE is not set
+CONFIG_PL320_MBOX=y
CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m
# AllWinner
@@ -187,6 +182,7 @@ CONFIG_MACH_SUN6I=y
CONFIG_MACH_SUN7I=y
CONFIG_MACH_SUN8I=y
# CONFIG_MACH_SUN9I is not set
+CONFIG_SUNXI_SRAM=y
CONFIG_DMA_SUN6I=m
CONFIG_SUNXI_WATCHDOG=m
CONFIG_NET_VENDOR_ALLWINNER=y