diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
| commit | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch) | |
| tree | 869d633803eb7c429624d3bd16a6117816849763 /drivers/net/Kconfig | |
| parent | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff) | |
| parent | b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 3ed49f1337c7..985a0550c803 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1727,12 +1727,14 @@ config KS8842 | |||
| 1727 | tristate "Micrel KSZ8842" | 1727 | tristate "Micrel KSZ8842" |
| 1728 | depends on HAS_IOMEM | 1728 | depends on HAS_IOMEM |
| 1729 | help | 1729 | help |
| 1730 | This platform driver is for Micrel KSZ8842 chip. | 1730 | This platform driver is for Micrel KSZ8842 / KS8842 |
| 1731 | 2-port ethernet switch chip (managed, VLAN, QoS). | ||
| 1731 | 1732 | ||
| 1732 | config KS8851 | 1733 | config KS8851 |
| 1733 | tristate "Micrel KS8851 SPI" | 1734 | tristate "Micrel KS8851 SPI" |
| 1734 | depends on SPI | 1735 | depends on SPI |
| 1735 | select MII | 1736 | select MII |
| 1737 | select CRC32 | ||
| 1736 | help | 1738 | help |
| 1737 | SPI driver for Micrel KS8851 SPI attached network chip. | 1739 | SPI driver for Micrel KS8851 SPI attached network chip. |
| 1738 | 1740 | ||