summaryrefslogtreecommitdiffstats
path: root/baseconfig
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2017-03-20 09:46:22 +0000
committerPeter Robinson <pbrobinson@gmail.com>2017-03-20 09:46:22 +0000
commit58a0e11959b0b409914ee77f28ac61f8ef318728 (patch)
tree21d0500bdab823bbdce0d3445a12a356f4d4d6ef /baseconfig
parent0b1166dd26a3010024eebd72c12943c5f55b5044 (diff)
downloadkernel-58a0e11959b0b409914ee77f28ac61f8ef318728.tar.gz
kernel-58a0e11959b0b409914ee77f28ac61f8ef318728.tar.xz
kernel-58a0e11959b0b409914ee77f28ac61f8ef318728.zip
Rebase AllWinner sun8i emac driver to latest proposed upstream
Diffstat (limited to 'baseconfig')
-rw-r--r--baseconfig/arm/arm64/CONFIG_DWMAC_SUN8I1
-rw-r--r--baseconfig/arm/arm64/CONFIG_SUN8I_EMAC1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DWMAC_SUN8I1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SUN8I_EMAC1
4 files changed, 2 insertions, 2 deletions
diff --git a/baseconfig/arm/arm64/CONFIG_DWMAC_SUN8I b/baseconfig/arm/arm64/CONFIG_DWMAC_SUN8I
new file mode 100644
index 000000000..ce05f93b3
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_DWMAC_SUN8I
@@ -0,0 +1 @@
+CONFIG_DWMAC_SUN8I=m
diff --git a/baseconfig/arm/arm64/CONFIG_SUN8I_EMAC b/baseconfig/arm/arm64/CONFIG_SUN8I_EMAC
deleted file mode 100644
index 1b91ca143..000000000
--- a/baseconfig/arm/arm64/CONFIG_SUN8I_EMAC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SUN8I_EMAC=m
diff --git a/baseconfig/arm/armv7/CONFIG_DWMAC_SUN8I b/baseconfig/arm/armv7/CONFIG_DWMAC_SUN8I
new file mode 100644
index 000000000..ce05f93b3
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_DWMAC_SUN8I
@@ -0,0 +1 @@
+CONFIG_DWMAC_SUN8I=m
diff --git a/baseconfig/arm/armv7/CONFIG_SUN8I_EMAC b/baseconfig/arm/armv7/CONFIG_SUN8I_EMAC
deleted file mode 100644
index 1b91ca143..000000000
--- a/baseconfig/arm/armv7/CONFIG_SUN8I_EMAC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SUN8I_EMAC=m