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 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
[pandora-kernel.git]
/
drivers
/
net
/
Kconfig
diff --git
a/drivers/net/Kconfig
b/drivers/net/Kconfig
index
fe58156
..
5db667c
100644
(file)
--- a/
drivers/net/Kconfig
+++ b/
drivers/net/Kconfig
@@
-484,7
+484,7
@@
config XTENSA_XT2000_SONIC
config MIPS_AU1X00_ENET
tristate "MIPS AU1000 Ethernet support"
config MIPS_AU1X00_ENET
tristate "MIPS AU1000 Ethernet support"
- depends on
SOC_AU1X00
+ depends on
MIPS_ALCHEMY
select PHYLIB
select CRC32
help
select PHYLIB
select CRC32
help
@@
-914,7
+914,7
@@
config SMC91X
tristate "SMC 91C9x/91C1xxx support"
select CRC32
select MII
tristate "SMC 91C9x/91C1xxx support"
select CRC32
select MII
- depends on ARM ||
REDWOOD_5 || REDWOOD_6 ||
M32R || SUPERH || \
+ depends on ARM || M32R || SUPERH || \
MIPS || BLACKFIN || MN10300 || COLDFIRE
help
This is a driver for SMC's 91x series of Ethernet chipsets,
MIPS || BLACKFIN || MN10300 || COLDFIRE
help
This is a driver for SMC's 91x series of Ethernet chipsets,
@@
-2428,7
+2428,7
@@
config UGETH_TX_ON_DEMAND
config MV643XX_ETH
tristate "Marvell Discovery (643XX) and Orion ethernet support"
config MV643XX_ETH
tristate "Marvell Discovery (643XX) and Orion ethernet support"
- depends on
MV64X60 || PPC32 || PLAT_ORION
+ depends on
(MV64X60 || PPC32 || PLAT_ORION) && INET
select INET_LRO
select PHYLIB
help
select INET_LRO
select PHYLIB
help
@@
-2803,7
+2803,7
@@
config NIU
config PASEMI_MAC
tristate "PA Semi 1/10Gbit MAC"
config PASEMI_MAC
tristate "PA Semi 1/10Gbit MAC"
- depends on PPC_PASEMI && PCI
+ depends on PPC_PASEMI && PCI
&& INET
select PHYLIB
select INET_LRO
help
select PHYLIB
select INET_LRO
help