diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-09 13:51:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-09 13:51:13 -0800 |
| commit | ae5cdd405bfc5799c07080ec35f48283a9b0142a (patch) | |
| tree | b79a66de09bcef5404fb6a1f7de4cf1200023823 /drivers/misc/c2port | |
| parent | fe250923bbbbcbccc9aa7b84d05ee7a060450534 (diff) | |
| parent | b5266ea675c5a041e2852c7ccec4cf2d4f5e0cf4 (diff) | |
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/misc/c2port')
| -rw-r--r-- | drivers/misc/c2port/c2port-duramar2150.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/c2port/c2port-duramar2150.c b/drivers/misc/c2port/c2port-duramar2150.c index 778fc3fdfb9b..5484301d57d9 100644 --- a/drivers/misc/c2port/c2port-duramar2150.c +++ b/drivers/misc/c2port/c2port-duramar2150.c @@ -15,6 +15,7 @@ #include <linux/module.h> #include <linux/delay.h> #include <linux/io.h> +#include <linux/ioport.h> #include <linux/c2port.h> #define DATA_PORT 0x325 |