diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-04 07:58:28 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-04 07:58:28 -0400 |
| commit | e16852cfc5580b88cb327413ab8c89375f380592 (patch) | |
| tree | 67e7d5b84e2602986f2da689625e5a25d7af7bb4 /drivers/net/Kconfig | |
| parent | bdff78707f3ce47e891f3201c9666122a70556ce (diff) | |
| parent | 74e7ff8c50b6b022e6ffaa736b16a4dc161d3eaf (diff) | |
Merge branch 'tracing/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/urgent
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 c155bd3ec9f1..5f6509a5f640 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 |