diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-30 15:02:32 +1000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-30 15:02:32 +1000 |
commit | 7e3f36c3e107bd76b6709e358b1e7c703fb6f81a (patch) | |
tree | 16d542955f2c2a3c8c84fde34be773610b65dee1 /drivers/net/Kconfig | |
parent | 1caca371e80b0d40352512806368f6ff43e2cf52 (diff) | |
parent | ff349103964d43c28b7b80bdecf7ace0113b3dda (diff) | |
download | linux-7e3f36c3e107bd76b6709e358b1e7c703fb6f81a.tar.gz linux-7e3f36c3e107bd76b6709e358b1e7c703fb6f81a.tar.bz2 linux-7e3f36c3e107bd76b6709e358b1e7c703fb6f81a.zip |
Merge commit 'jwb/next' into next
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ce2fcdd4ab90..313d3060fc1d 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -913,7 +913,7 @@ config SMC91X 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, |