Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2014-08-18 03:54:15 +0200
committerAndreas Färber <afaerber@suse.de>2014-08-18 03:54:15 +0200
commitd585c06aa54224bf97a9dab4ac150db1d9ec76bc (patch)
tree7c9af687ff2cd6c5bad32d121431d890471204a0
parent2849a9fccc22fe490969a9052611bb7849acac9a (diff)
parent4f16280962648da6c30ea662728108cea1d7432c (diff)
Merge branch 'master' into stable
-rw-r--r--config/armv7hl/default2
-rw-r--r--config/armv7hl/lpae9
2 files changed, 8 insertions, 3 deletions
diff --git a/config/armv7hl/default b/config/armv7hl/default
index 3aa6e820ea..c581fc102e 100644
--- a/config/armv7hl/default
+++ b/config/armv7hl/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.16.0 Kernel Configuration
+# Linux/arm 3.16.1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
diff --git a/config/armv7hl/lpae b/config/armv7hl/lpae
index f73c55164e..4b686e75f2 100644
--- a/config/armv7hl/lpae
+++ b/config/armv7hl/lpae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.16.0 Kernel Configuration
+# Linux/arm 3.16.1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2385,7 +2385,12 @@ CONFIG_SMSC911X=m
# CONFIG_SMSC911X_ARCH_HOOKS is not set
# CONFIG_SMSC9420 is not set
CONFIG_NET_VENDOR_STMICRO=y
-# CONFIG_STMMAC_ETH is not set
+CONFIG_STMMAC_ETH=m
+CONFIG_STMMAC_PLATFORM=y
+CONFIG_DWMAC_SUNXI=y
+# CONFIG_STMMAC_PCI is not set
+# CONFIG_STMMAC_DEBUG_FS is not set
+# CONFIG_STMMAC_DA is not set
CONFIG_NET_VENDOR_SUN=y
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set