From 58a0e11959b0b409914ee77f28ac61f8ef318728 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 20 Mar 2017 09:46:22 +0000 Subject: Rebase AllWinner sun8i emac driver to latest proposed upstream --- baseconfig/arm/arm64/CONFIG_DWMAC_SUN8I | 1 + baseconfig/arm/arm64/CONFIG_SUN8I_EMAC | 1 - baseconfig/arm/armv7/CONFIG_DWMAC_SUN8I | 1 + baseconfig/arm/armv7/CONFIG_SUN8I_EMAC | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 baseconfig/arm/arm64/CONFIG_DWMAC_SUN8I delete mode 100644 baseconfig/arm/arm64/CONFIG_SUN8I_EMAC create mode 100644 baseconfig/arm/armv7/CONFIG_DWMAC_SUN8I delete mode 100644 baseconfig/arm/armv7/CONFIG_SUN8I_EMAC (limited to 'baseconfig/arm') 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 -- cgit