diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-07 22:50:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-07 22:50:41 -0400 |
| commit | bfb5bfa3c58adc2ef5dbd1bb95b79b31e0dc221c (patch) | |
| tree | 21753c7f94144a286584c1f631ad9bde89a1a438 /drivers/net | |
| parent | 7e58a3a148fb94e9ce09fb48d0ddd75c20ee7df9 (diff) | |
| parent | 123dc510c6e79f0c94718e2e6b5e4074754aa629 (diff) | |
Merge branch '2021-07-07-remove-non-migrated-platforms'
- Remove a large number of platforms that did not migrate to DM_PCI or
DM_USB by 2 years past the migration deadline and do not have a
migration imminent.
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/fm/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/mcfmii.c | 4 |
3 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 2a7c8f9a7ff..483401681d8 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -733,13 +733,11 @@ config SYS_DPAA_QBMAN ARCH_B4420 || \ ARCH_P1023 || \ ARCH_P2041 || \ - ARCH_T1023 || \ ARCH_T1024 || \ ARCH_T1040 || \ ARCH_T1042 || \ ARCH_T2080 || \ ARCH_T4240 || \ - ARCH_T4160 || \ ARCH_P4080 || \ ARCH_P3041 || \ ARCH_P5040 || \ diff --git a/drivers/net/fm/Makefile b/drivers/net/fm/Makefile index b4ede61113f..ae384121766 100644 --- a/drivers/net/fm/Makefile +++ b/drivers/net/fm/Makefile @@ -23,11 +23,9 @@ obj-$(CONFIG_ARCH_P4080) += p4080.o obj-$(CONFIG_ARCH_P5040) += p5040.o obj-$(CONFIG_ARCH_T1040) += t1040.o obj-$(CONFIG_ARCH_T1042) += t1040.o -obj-$(CONFIG_ARCH_T1023) += t1024.o obj-$(CONFIG_ARCH_T1024) += t1024.o obj-$(CONFIG_ARCH_T2080) += t2080.o obj-$(CONFIG_ARCH_T4240) += t4240.o -obj-$(CONFIG_ARCH_T4160) += t4240.o obj-$(CONFIG_ARCH_B4420) += b4860.o obj-$(CONFIG_ARCH_B4860) += b4860.o obj-$(CONFIG_ARCH_LS1043A) += ls1043.o diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c index 0987266c96e..ca06b35316d 100644 --- a/drivers/net/mcfmii.c +++ b/drivers/net/mcfmii.c @@ -11,11 +11,7 @@ #include <asm/global_data.h> #include <linux/delay.h> -#ifdef CONFIG_MCF547x_8x -#include <asm/fsl_mcdmafec.h> -#else #include <asm/fec.h> -#endif #include <asm/immap.h> #include <linux/mii.h> |