diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-01-17 03:52:18 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-02-15 03:26:29 -0500 |
commit | 085e79ed88351d2f3cbf257ff4fc00394792da18 (patch) | |
tree | d21a1ccdbc05ff14e0a6bd0818547c24ac63bda8 /drivers/net/fec.c | |
parent | 24e531b401752995493fa36ee8d8f10c45038e75 (diff) |
net/fec: consolidate all i.MX options to CONFIG_ARM
Moreover stop listing all i.MX platforms featuring a FEC, and use
the platform's config symbol that selects registration of a fec device
instead. This might make it easier to add new platforms.
Set default = y for ARMs having a fec to reduce defconfig sizes.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'drivers/net/fec.c')
-rw-r--r-- | drivers/net/fec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 14eb6604a7f5..dd4e580c7f35 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 |