diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /drivers/net/Kconfig | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index f053ba5c37ba..3ed49f1337c7 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1729,6 +1729,13 @@ config KS8842 | |||
| 1729 | help | 1729 | help |
| 1730 | This platform driver is for Micrel KSZ8842 chip. | 1730 | This platform driver is for Micrel KSZ8842 chip. |
| 1731 | 1731 | ||
| 1732 | config KS8851 | ||
| 1733 | tristate "Micrel KS8851 SPI" | ||
| 1734 | depends on SPI | ||
| 1735 | select MII | ||
| 1736 | help | ||
| 1737 | SPI driver for Micrel KS8851 SPI attached network chip. | ||
| 1738 | |||
| 1732 | config VIA_RHINE | 1739 | config VIA_RHINE |
| 1733 | tristate "VIA Rhine support" | 1740 | tristate "VIA Rhine support" |
| 1734 | depends on NET_PCI && PCI | 1741 | depends on NET_PCI && PCI |