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 branch 'linus' into x86/urgent
[pandora-kernel.git]
/
drivers
/
net
/
Kconfig
diff --git
a/drivers/net/Kconfig
b/drivers/net/Kconfig
index
f4182cf
..
45a41b5
100644
(file)
--- a/
drivers/net/Kconfig
+++ b/
drivers/net/Kconfig
@@
-217,7
+217,7
@@
config MII
config MACB
tristate "Atmel MACB support"
config MACB
tristate "Atmel MACB support"
- depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91CAP9
+ depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91
SAM9G20 || ARCH_AT91
CAP9
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