diff options
author | David S. Miller <davem@davemloft.net> | 2009-09-24 18:13:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-24 18:13:11 -0400 |
commit | 8b3f6af86378d0a10ca2f1ded1da124aef13b62c (patch) | |
tree | de6ca90295730343c495be8d98be8efa322140ef /drivers/net/Kconfig | |
parent | 139d6065c83071d5f66cd013a274a43699f8e2c1 (diff) | |
parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/cpc-usb/TODO
drivers/staging/cpc-usb/cpc-usb_drv.c
drivers/staging/cpc-usb/cpc.h
drivers/staging/cpc-usb/cpc_int.h
drivers/staging/cpc-usb/cpcusb.h
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index f9fbd52b799b..2bea67c134f0 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -209,7 +209,7 @@ config MII | |||
209 | 209 | ||
210 | config MACB | 210 | config MACB |
211 | tristate "Atmel MACB support" | 211 | tristate "Atmel MACB support" |
212 | depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91CAP9 | 212 | depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91SAM9G45 || ARCH_AT91CAP9 |
213 | select PHYLIB | 213 | select PHYLIB |
214 | help | 214 | help |
215 | The Atmel MACB ethernet interface is found on many AT32 and AT91 | 215 | The Atmel MACB ethernet interface is found on many AT32 and AT91 |
@@ -1934,6 +1934,15 @@ config XILINX_EMACLITE | |||
1934 | help | 1934 | help |
1935 | This driver supports the 10/100 Ethernet Lite from Xilinx. | 1935 | This driver supports the 10/100 Ethernet Lite from Xilinx. |
1936 | 1936 | ||
1937 | config BCM63XX_ENET | ||
1938 | tristate "Broadcom 63xx internal mac support" | ||
1939 | depends on BCM63XX | ||
1940 | select MII | ||
1941 | select PHYLIB | ||
1942 | help | ||
1943 | This driver supports the ethernet MACs in the Broadcom 63xx | ||
1944 | MIPS chipset family (BCM63XX). | ||
1945 | |||
1937 | source "drivers/net/fs_enet/Kconfig" | 1946 | source "drivers/net/fs_enet/Kconfig" |
1938 | 1947 | ||
1939 | endif # NET_ETHERNET | 1948 | endif # NET_ETHERNET |