diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 19:44:47 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 19:44:47 -0800 |
commit | 32aaeffbd4a7457bf2f7448b33b5946ff2a960eb (patch) | |
tree | faf7ad871d87176423ff9ed1d1ba4d9c688fc23f /drivers/hid | |
parent | 208bca0860406d16398145ddd950036a737c3c9d (diff) | |
parent | 67b84999b1a8b1af5625b1eabe92146c5eb42932 (diff) | |
download | linux-32aaeffbd4a7457bf2f7448b33b5946ff2a960eb.tar.gz linux-32aaeffbd4a7457bf2f7448b33b5946ff2a960eb.tar.bz2 linux-32aaeffbd4a7457bf2f7448b33b5946ff2a960eb.zip |
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
Revert "tracing: Include module.h in define_trace.h"
irq: don't put module.h into irq.h for tracking irqgen modules.
bluetooth: macroize two small inlines to avoid module.h
ip_vs.h: fix implicit use of module_get/module_put from module.h
nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
include: replace linux/module.h with "struct module" wherever possible
include: convert various register fcns to macros to avoid include chaining
crypto.h: remove unused crypto_tfm_alg_modname() inline
uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
pm_runtime.h: explicitly requires notifier.h
linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
miscdevice.h: fix up implicit use of lists and types
stop_machine.h: fix implicit use of smp.h for smp_processor_id
of: fix implicit use of errno.h in include/linux/of.h
of_platform.h: delete needless include <linux/module.h>
acpi: remove module.h include from platform/aclinux.h
miscdevice.h: delete unnecessary inclusion of module.h
device_cgroup.h: delete needless include <linux/module.h>
net: sch_generic remove redundant use of <linux/module.h>
net: inet_timewait_sock doesnt need <linux/module.h>
...
Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
- drivers/media/dvb/frontends/dibx000_common.c
- drivers/media/video/{mt9m111.c,ov6650.c}
- drivers/mfd/ab3550-core.c
- include/linux/dmaengine.h
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-axff.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-debug.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-dr.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-emsff.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-gaff.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-holtekff.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-picolcd.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-pl.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-roccat-common.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-roccat.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-sjoy.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-tmff.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-zpff.c | 1 | ||||
-rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 1 |
14 files changed, 14 insertions, 0 deletions
diff --git a/drivers/hid/hid-axff.c b/drivers/hid/hid-axff.c index 3bdb4500f95e..5be858dd9a15 100644 --- a/drivers/hid/hid-axff.c +++ b/drivers/hid/hid-axff.c @@ -31,6 +31,7 @@ #include <linux/slab.h> #include <linux/usb.h> #include <linux/hid.h> +#include <linux/module.h> #include "hid-ids.h" diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c index 9a243ca96e6d..ee80d733801d 100644 --- a/drivers/hid/hid-debug.c +++ b/drivers/hid/hid-debug.c @@ -31,6 +31,7 @@ #include <linux/debugfs.h> #include <linux/seq_file.h> #include <linux/sched.h> +#include <linux/export.h> #include <linux/slab.h> #include <linux/uaccess.h> #include <linux/poll.h> diff --git a/drivers/hid/hid-dr.c b/drivers/hid/hid-dr.c index 61eece47204d..e832f44ae383 100644 --- a/drivers/hid/hid-dr.c +++ b/drivers/hid/hid-dr.c @@ -31,6 +31,7 @@ #include <linux/slab.h> #include <linux/usb.h> #include <linux/hid.h> +#include <linux/module.h> #include "hid-ids.h" diff --git a/drivers/hid/hid-emsff.c b/drivers/hid/hid-emsff.c index a5dc13fe367b..9bdde867a02f 100644 --- a/drivers/hid/hid-emsff.c +++ b/drivers/hid/hid-emsff.c @@ -24,6 +24,7 @@ #include <linux/hid.h> #include <linux/input.h> #include <linux/usb.h> +#include <linux/module.h> #include "hid-ids.h" #include "usbhid/usbhid.h" diff --git a/drivers/hid/hid-gaff.c b/drivers/hid/hid-gaff.c index 279ba530003c..f1e1bcf67427 100644 --- a/drivers/hid/hid-gaff.c +++ b/drivers/hid/hid-gaff.c @@ -31,6 +31,7 @@ #include <linux/slab.h> #include <linux/usb.h> #include <linux/hid.h> +#include <linux/module.h> #include "hid-ids.h" #ifdef CONFIG_GREENASIA_FF diff --git a/drivers/hid/hid-holtekff.c b/drivers/hid/hid-holtekff.c index 91e3a032112b..4e7542151e22 100644 --- a/drivers/hid/hid-holtekff.c +++ b/drivers/hid/hid-holtekff.c @@ -25,6 +25,7 @@ #include <linux/hid.h> #include <linux/input.h> +#include <linux/module.h> #include <linux/slab.h> #include <linux/usb.h> diff --git a/drivers/hid/hid-picolcd.c b/drivers/hid/hid-picolcd.c index 1782693819f3..01e7d2cd7c26 100644 --- a/drivers/hid/hid-picolcd.c +++ b/drivers/hid/hid-picolcd.c @@ -36,6 +36,7 @@ #include <linux/completion.h> #include <linux/uaccess.h> +#include <linux/module.h> #define PICOLCD_NAME "PicoLCD (graphic)" diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c index 06e5300d43d2..070f93a5c11b 100644 --- a/drivers/hid/hid-pl.c +++ b/drivers/hid/hid-pl.c @@ -40,6 +40,7 @@ #include <linux/input.h> #include <linux/slab.h> +#include <linux/module.h> #include <linux/usb.h> #include <linux/hid.h> diff --git a/drivers/hid/hid-roccat-common.c b/drivers/hid/hid-roccat-common.c index edf898dee28b..b07e7f96a358 100644 --- a/drivers/hid/hid-roccat-common.c +++ b/drivers/hid/hid-roccat-common.c @@ -13,6 +13,7 @@ #include <linux/hid.h> #include <linux/slab.h> +#include <linux/module.h> #include "hid-roccat-common.h" static inline uint16_t roccat_common_feature_report(uint8_t report_id) diff --git a/drivers/hid/hid-roccat.c b/drivers/hid/hid-roccat.c index 56ce12c23b02..b685b04dbf9d 100644 --- a/drivers/hid/hid-roccat.c +++ b/drivers/hid/hid-roccat.c @@ -27,6 +27,7 @@ #include <linux/poll.h> #include <linux/sched.h> #include <linux/hid-roccat.h> +#include <linux/module.h> #define ROCCAT_FIRST_MINOR 0 #define ROCCAT_MAX_DEVICES 8 diff --git a/drivers/hid/hid-sjoy.c b/drivers/hid/hid-sjoy.c index 670da9109f86..4b1448613ea6 100644 --- a/drivers/hid/hid-sjoy.c +++ b/drivers/hid/hid-sjoy.c @@ -30,6 +30,7 @@ #include <linux/slab.h> #include <linux/usb.h> #include <linux/hid.h> +#include <linux/module.h> #include "hid-ids.h" #ifdef CONFIG_SMARTJOYPLUS_FF diff --git a/drivers/hid/hid-tmff.c b/drivers/hid/hid-tmff.c index 575862b0688e..83a933b9c2e9 100644 --- a/drivers/hid/hid-tmff.c +++ b/drivers/hid/hid-tmff.c @@ -31,6 +31,7 @@ #include <linux/input.h> #include <linux/slab.h> #include <linux/usb.h> +#include <linux/module.h> #include "hid-ids.h" diff --git a/drivers/hid/hid-zpff.c b/drivers/hid/hid-zpff.c index f31fab012f2f..f6ba81df71bd 100644 --- a/drivers/hid/hid-zpff.c +++ b/drivers/hid/hid-zpff.c @@ -25,6 +25,7 @@ #include <linux/input.h> #include <linux/slab.h> #include <linux/usb.h> +#include <linux/module.h> #include "hid-ids.h" diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 4ea464151c3b..5028d60a22a1 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@ -16,6 +16,7 @@ */ #include <linux/hid.h> +#include <linux/export.h> #include <linux/slab.h> #include "../hid-ids.h" |