diff options
-rw-r--r-- | drivers/net/Kconfig | 3 | ||||
-rw-r--r-- | drivers/net/fec.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 03823327db2..65027a72ca9 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -1944,7 +1944,8 @@ config 68360_ENET | |||
1944 | config FEC | 1944 | config FEC |
1945 | bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)" | 1945 | bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)" |
1946 | depends on M523x || M527x || M5272 || M528x || M520x || M532x || \ | 1946 | depends on M523x || M527x || M5272 || M528x || M520x || M532x || \ |
1947 | MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 || SOC_IMX28 | 1947 | IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC |
1948 | default IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC if ARM | ||
1948 | select PHYLIB | 1949 | select PHYLIB |
1949 | help | 1950 | help |
1950 | Say Y here if you want to use the built-in 10/100 Fast ethernet | 1951 | Say Y here if you want to use the built-in 10/100 Fast ethernet |
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 14eb6604a7f..dd4e580c7f3 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c | |||
@@ -54,7 +54,7 @@ | |||
54 | 54 | ||
55 | #include "fec.h" | 55 | #include "fec.h" |
56 | 56 | ||
57 | #if defined(CONFIG_ARCH_MXC) || defined(CONFIG_SOC_IMX28) | 57 | #if defined(CONFIG_ARM) |
58 | #define FEC_ALIGNMENT 0xf | 58 | #define FEC_ALIGNMENT 0xf |
59 | #else | 59 | #else |
60 | #define FEC_ALIGNMENT 0x3 | 60 | #define FEC_ALIGNMENT 0x3 |
@@ -147,8 +147,7 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); | |||
147 | * account when setting it. | 147 | * account when setting it. |
148 | */ | 148 | */ |
149 | #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \ | 149 | #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \ |
150 | defined(CONFIG_M520x) || defined(CONFIG_M532x) || \ | 150 | defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) |
151 | defined(CONFIG_ARCH_MXC) || defined(CONFIG_SOC_IMX28) | ||
152 | #define OPT_FRAME_SIZE (PKT_MAXBUF_SIZE << 16) | 151 | #define OPT_FRAME_SIZE (PKT_MAXBUF_SIZE << 16) |
153 | #else | 152 | #else |
154 | #define OPT_FRAME_SIZE 0 | 153 | #define OPT_FRAME_SIZE 0 |