diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-10 01:51:13 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-10 01:51:13 +0400 |
| commit | ae5cdd405bfc5799c07080ec35f48283a9b0142a (patch) | |
| tree | b79a66de09bcef5404fb6a1f7de4cf1200023823 /drivers/net | |
| parent | fe250923bbbbcbccc9aa7b84d05ee7a060450534 (diff) | |
| parent | b5266ea675c5a041e2852c7ccec4cf2d4f5e0cf4 (diff) | |
| download | linux-ae5cdd405bfc5799c07080ec35f48283a9b0142a.tar.xz | |
Merge tag 'char-misc-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Minor char-misc fixes for 3.3-rc3
Nothing big here, some Kconfig fixes for the MISC_DEVICES config option
that was being used incorrectly, and some other minor bug fixes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* tag 'char-misc-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
mmc: cb710 core: Add missing spin_lock_init for irq_lock of struct cb710_chip
cs5535-mfgpt: don't call __init function from __devinit
vmw_balloon: fix for a -Wuninitialized warning
drivers: misc: Remove MISC_DEVICES config option
c2port: fix build error for duramar2150 due to missing header.
Diffstat (limited to 'drivers/net')
| -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 select NET_CORE select MII select CRC32 - select MISC_DEVICES select EEPROM_93CX6 ---help--- SPI driver for Micrel KS8851 SPI attached network chip. |