diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-10 23:32:28 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-10 23:32:28 -0500 |
| commit | d5ef8a4d87ab21d575ac86366599c9152a28028d (patch) | |
| tree | 8b1be85ad1af7ee6a0e3e36c77ae738c966c1f21 /drivers/net/ethernet/micrel | |
| parent | d9dd966d7fc088a6bed991c2b1e2fba4485e0a31 (diff) | |
| parent | 8df54d622a120058ee8bec38743c9b8f091c8e58 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/infiniband/hw/nes/nes_cm.c
Simple whitespace conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/micrel')
| -rw-r--r-- | drivers/net/ethernet/micrel/Kconfig | 1 |
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. |