git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[pandora-kernel.git]
/
drivers
/
net
/
Kconfig
diff --git
a/drivers/net/Kconfig
b/drivers/net/Kconfig
index
d24f54b
..
7ca1fc8
100644
(file)
--- a/
drivers/net/Kconfig
+++ b/
drivers/net/Kconfig
@@
-2,6
+2,9
@@
# Network device configuration
#
# Network device configuration
#
+config HAVE_NET_MACB
+ bool
+
menuconfig NETDEVICES
default y if UML
depends on NET
menuconfig NETDEVICES
default y if UML
depends on NET
@@
-221,7
+224,7
@@
if NET_ETHERNET
config MACB
tristate "Atmel MACB support"
config MACB
tristate "Atmel MACB support"
- depends on
AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91SAM9G45 || ARCH_AT91CAP9
+ depends on
HAVE_NET_MACB
select PHYLIB
help
The Atmel MACB ethernet interface is found on many AT32 and AT91
select PHYLIB
help
The Atmel MACB ethernet interface is found on many AT32 and AT91