diff options
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 16fe4f9b719b..f4b39274308a 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -238,8 +238,8 @@ source "drivers/net/arm/Kconfig" | |||
238 | config AX88796 | 238 | config AX88796 |
239 | tristate "ASIX AX88796 NE2000 clone support" | 239 | tristate "ASIX AX88796 NE2000 clone support" |
240 | depends on ARM || MIPS || SUPERH | 240 | depends on ARM || MIPS || SUPERH |
241 | select CRC32 | 241 | select PHYLIB |
242 | select MII | 242 | select MDIO_BITBANG |
243 | help | 243 | help |
244 | AX88796 driver, using platform bus to provide | 244 | AX88796 driver, using platform bus to provide |
245 | chip detection and resources | 245 | chip detection and resources |
@@ -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 |
@@ -2864,7 +2865,7 @@ config MLX4_CORE | |||
2864 | default n | 2865 | default n |
2865 | 2866 | ||
2866 | config MLX4_DEBUG | 2867 | config MLX4_DEBUG |
2867 | bool "Verbose debugging output" if (MLX4_CORE && EMBEDDED) | 2868 | bool "Verbose debugging output" if (MLX4_CORE && EXPERT) |
2868 | depends on MLX4_CORE | 2869 | depends on MLX4_CORE |
2869 | default y | 2870 | default y |
2870 | ---help--- | 2871 | ---help--- |