summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2014-08-14 12:50:16 +0100
committerPeter Robinson <pbrobinson@gmail.com>2014-08-14 12:50:16 +0100
commit76658d2649bbaaba26af07e94d1cd545f2aad0d4 (patch)
tree38b886b7c31b82bed99ea5aace9ecccc434547ff
parenta412315350b506878e6751c49d0fdbc71a123765 (diff)
downloadkernel-76658d2649bbaaba26af07e94d1cd545f2aad0d4.tar.gz
kernel-76658d2649bbaaba26af07e94d1cd545f2aad0d4.tar.xz
kernel-76658d2649bbaaba26af07e94d1cd545f2aad0d4.zip
minor arm config update
-rw-r--r--config-arm-generic1
-rw-r--r--config-armv7-generic1
2 files changed, 1 insertions, 1 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 7cbaeefec..ac89eb201 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -251,7 +251,6 @@ CONFIG_CMA_AREAS=7
# CONFIG_SCSI_MPT3SAS is not set
# serial
-# CONFIG_SERIAL_SH_SCI is not set
# CONFIG_SERIAL_MAX3100 is not set
# CONFIG_SERIAL_MAX310X is not set
# CONFIG_SERIAL_IFX6X60 is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index c202e29ae..10ab6b660 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -167,6 +167,7 @@ CONFIG_MACH_SUN5I=y
CONFIG_MACH_SUN6I=y
CONFIG_MACH_SUN7I=y
# CONFIG_MACH_SUN8I is not set
+CONFIG_DMA_SUN6I=m
CONFIG_SUNXI_WATCHDOG=m
CONFIG_MDIO_SUN4I=m
CONFIG_NET_VENDOR_ALLWINNER=y