diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-20 11:15:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-20 11:15:18 -0700 |
| commit | 9f9d2760da8c7f94fae119fac3e13d5a1702f8f0 (patch) | |
| tree | e244a2969edceff750478e7d98355b76ef30aa0f /drivers/char/ramoops.c | |
| parent | ad2a8e6078a16d3b61b530f1447110841c36ae56 (diff) | |
| parent | b222258ac11cae3e0350fe5992ad164a7b128103 (diff) | |
Merge tag 'char-misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char and misc patches for 3.4-rc1 from Greg KH:
"Not much here, just a few minor fixes and some conversions to the
module_*_driver() functions, making the codebase smaller."
* tag 'char-misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
misc: bmp085: Use unsigned long to store jiffies
char/ramoops: included linux/err.h twice
misc: bmp085: Handle jiffies overflow correctly
misc: fsa9480: Remove obsolete cleanup for clientdata
char: Fix typo in tlclk.c
char: Fix typo in viotape.c
cs5535-mfgpt: don't call __init function from __devinit
MISC: convert drivers/misc/* to use module_spi_driver()
MISC: convert drivers/misc/* to use module_i2c_driver()
MISC: convert drivers/misc/* to use module_platform_driver()
Diffstat (limited to 'drivers/char/ramoops.c')
| -rw-r--r-- | drivers/char/ramoops.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/ramoops.c b/drivers/char/ramoops.c index 9fec3232b736..2a5e45d2a9f8 100644 --- a/drivers/char/ramoops.c +++ b/drivers/char/ramoops.c @@ -26,7 +26,6 @@ #include <linux/module.h> #include <linux/kmsg_dump.h> #include <linux/time.h> -#include <linux/err.h> #include <linux/io.h> #include <linux/ioport.h> #include <linux/platform_device.h> |