diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
| commit | 74d154189d597b91da4322996dbf4f5c3d1544ab (patch) | |
| tree | 6f09861b5e2f875d2d8ea2127b16add9103221c6 /drivers/net/arm/Kconfig | |
| parent | 5a6338db37885af06760d40cad589316e48431e9 (diff) | |
| parent | ffafa60d496f80c250f2ae0340ae94434c0b0b4d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
Diffstat (limited to 'drivers/net/arm/Kconfig')
| -rw-r--r-- | drivers/net/arm/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig index 2895db13bfa4..c37ee9e6b67b 100644 --- a/drivers/net/arm/Kconfig +++ b/drivers/net/arm/Kconfig | |||
| @@ -63,3 +63,11 @@ config IXP4XX_ETH | |||
| 63 | help | 63 | help |
| 64 | Say Y here if you want to use built-in Ethernet ports | 64 | Say Y here if you want to use built-in Ethernet ports |
| 65 | on IXP4xx processor. | 65 | on IXP4xx processor. |
| 66 | |||
| 67 | config W90P910_ETH | ||
| 68 | tristate "Nuvoton w90p910 Ethernet support" | ||
| 69 | depends on ARM && ARCH_W90X900 | ||
| 70 | select PHYLIB | ||
| 71 | help | ||
| 72 | Say Y here if you want to use built-in Ethernet ports | ||
| 73 | on w90p910 processor. | ||