aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/micrel/Kconfig
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-02-24 19:48:27 -0500
committerTony Lindgren <tony@atomide.com>2012-02-24 19:48:27 -0500
commitffd76d8be36da09f8456c55569c008f5aa93095e (patch)
tree4a5e537edcdd3be9197c5fb7af1b4f7e4780ef77 /drivers/net/ethernet/micrel/Kconfig
parentbfe9c8ae114009491f51452ec727667d516ee79f (diff)
parentf0e15e2b0c6b3e89daade25a1e9a2d80136c14c3 (diff)
Merge branch 'for_3.4/dts_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into dt
Diffstat (limited to 'drivers/net/ethernet/micrel/Kconfig')
-rw-r--r--drivers/net/ethernet/micrel/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/micrel/Kconfig b/drivers/net/ethernet/micrel/Kconfig
index 1ea811cf515b..fe42fc00d8d3 100644
--- a/drivers/net/ethernet/micrel/Kconfig
+++ b/drivers/net/ethernet/micrel/Kconfig
@@ -42,7 +42,6 @@ config KS8851
42 select NET_CORE 42 select NET_CORE
43 select MII 43 select MII
44 select CRC32 44 select CRC32
45 select MISC_DEVICES
46 select EEPROM_93CX6 45 select EEPROM_93CX6
47 ---help--- 46 ---help---
48 SPI driver for Micrel KS8851 SPI attached network chip. 47 SPI driver for Micrel KS8851 SPI attached network chip.