diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 22:44:47 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 22:44:47 -0500 |
| commit | 32aaeffbd4a7457bf2f7448b33b5946ff2a960eb (patch) | |
| tree | faf7ad871d87176423ff9ed1d1ba4d9c688fc23f /drivers/misc | |
| parent | 208bca0860406d16398145ddd950036a737c3c9d (diff) | |
| parent | 67b84999b1a8b1af5625b1eabe92146c5eb42932 (diff) | |
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/misc')
| -rw-r--r-- | drivers/misc/ab8500-pwm.c | 1 | ||||
| -rw-r--r-- | drivers/misc/atmel-ssc.c | 1 | ||||
| -rw-r--r-- | drivers/misc/atmel_tclib.c | 1 | ||||
| -rw-r--r-- | drivers/misc/bh1780gli.c | 1 | ||||
| -rw-r--r-- | drivers/misc/kgdbts.c | 1 | ||||
| -rw-r--r-- | drivers/misc/sgi-gru/grukservices.c | 1 | ||||
| -rw-r--r-- | drivers/misc/ti-st/st_kim.c | 1 | ||||
| -rw-r--r-- | drivers/misc/tifm_7xx1.c | 1 | ||||
| -rw-r--r-- | drivers/misc/tifm_core.c | 1 |
9 files changed, 9 insertions, 0 deletions
diff --git a/drivers/misc/ab8500-pwm.c b/drivers/misc/ab8500-pwm.c index 35903154ca2e..2208a9d52622 100644 --- a/drivers/misc/ab8500-pwm.c +++ b/drivers/misc/ab8500-pwm.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/pwm.h> | 10 | #include <linux/pwm.h> |
| 11 | #include <linux/mfd/ab8500.h> | 11 | #include <linux/mfd/ab8500.h> |
| 12 | #include <linux/mfd/abx500.h> | 12 | #include <linux/mfd/abx500.h> |
| 13 | #include <linux/module.h> | ||
| 13 | 14 | ||
| 14 | /* | 15 | /* |
| 15 | * PWM Out generators | 16 | * PWM Out generators |
diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c index 769a4e8e10dc..5bb187781074 100644 --- a/drivers/misc/atmel-ssc.c +++ b/drivers/misc/atmel-ssc.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/spinlock.h> | 16 | #include <linux/spinlock.h> |
| 17 | #include <linux/atmel-ssc.h> | 17 | #include <linux/atmel-ssc.h> |
| 18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
| 19 | #include <linux/module.h> | ||
| 19 | 20 | ||
| 20 | /* Serialize access to ssc_list and user count */ | 21 | /* Serialize access to ssc_list and user count */ |
| 21 | static DEFINE_SPINLOCK(user_lock); | 22 | static DEFINE_SPINLOCK(user_lock); |
diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c index a844810b50f6..4bcfc3759734 100644 --- a/drivers/misc/atmel_tclib.c +++ b/drivers/misc/atmel_tclib.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 8 | #include <linux/platform_device.h> | 8 | #include <linux/platform_device.h> |
| 9 | #include <linux/slab.h> | 9 | #include <linux/slab.h> |
| 10 | #include <linux/export.h> | ||
| 10 | 11 | ||
| 11 | /* Number of bytes to reserve for the iomem resource */ | 12 | /* Number of bytes to reserve for the iomem resource */ |
| 12 | #define ATMEL_TC_IOMEM_SIZE 256 | 13 | #define ATMEL_TC_IOMEM_SIZE 256 |
diff --git a/drivers/misc/bh1780gli.c b/drivers/misc/bh1780gli.c index 82fe2d067827..bfeea9ba702e 100644 --- a/drivers/misc/bh1780gli.c +++ b/drivers/misc/bh1780gli.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/mutex.h> | 22 | #include <linux/mutex.h> |
| 23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
| 24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 25 | #include <linux/module.h> | ||
| 25 | 26 | ||
| 26 | #define BH1780_REG_CONTROL 0x80 | 27 | #define BH1780_REG_CONTROL 0x80 |
| 27 | #define BH1780_REG_PARTID 0x8A | 28 | #define BH1780_REG_PARTID 0x8A |
diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c index 8cebec5e85ee..3f7ad83ed740 100644 --- a/drivers/misc/kgdbts.c +++ b/drivers/misc/kgdbts.c | |||
| @@ -102,6 +102,7 @@ | |||
| 102 | #include <linux/nmi.h> | 102 | #include <linux/nmi.h> |
| 103 | #include <linux/delay.h> | 103 | #include <linux/delay.h> |
| 104 | #include <linux/kthread.h> | 104 | #include <linux/kthread.h> |
| 105 | #include <linux/module.h> | ||
| 105 | 106 | ||
| 106 | #define v1printk(a...) do { \ | 107 | #define v1printk(a...) do { \ |
| 107 | if (verbose) \ | 108 | if (verbose) \ |
diff --git a/drivers/misc/sgi-gru/grukservices.c b/drivers/misc/sgi-gru/grukservices.c index 9e9bddaa95ae..913de07e577c 100644 --- a/drivers/misc/sgi-gru/grukservices.c +++ b/drivers/misc/sgi-gru/grukservices.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
| 32 | #include <linux/uaccess.h> | 32 | #include <linux/uaccess.h> |
| 33 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
| 34 | #include <linux/export.h> | ||
| 34 | #include <asm/io_apic.h> | 35 | #include <asm/io_apic.h> |
| 35 | #include "gru.h" | 36 | #include "gru.h" |
| 36 | #include "grulib.h" | 37 | #include "grulib.h" |
diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c index 3a3580566dfc..43ef8d162f2d 100644 --- a/drivers/misc/ti-st/st_kim.c +++ b/drivers/misc/ti-st/st_kim.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | 35 | ||
| 36 | #include <linux/skbuff.h> | 36 | #include <linux/skbuff.h> |
| 37 | #include <linux/ti_wilink_st.h> | 37 | #include <linux/ti_wilink_st.h> |
| 38 | #include <linux/module.h> | ||
| 38 | 39 | ||
| 39 | 40 | ||
| 40 | #define MAX_ST_DEVICES 3 /* Imagine 1 on each UART for now */ | 41 | #define MAX_ST_DEVICES 3 /* Imagine 1 on each UART for now */ |
diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c index a6ef18259da0..ba2479022670 100644 --- a/drivers/misc/tifm_7xx1.c +++ b/drivers/misc/tifm_7xx1.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/tifm.h> | 12 | #include <linux/tifm.h> |
| 13 | #include <linux/dma-mapping.h> | 13 | #include <linux/dma-mapping.h> |
| 14 | #include <linux/module.h> | ||
| 14 | 15 | ||
| 15 | #define DRIVER_NAME "tifm_7xx1" | 16 | #define DRIVER_NAME "tifm_7xx1" |
| 16 | #define DRIVER_VERSION "0.8" | 17 | #define DRIVER_VERSION "0.8" |
diff --git a/drivers/misc/tifm_core.c b/drivers/misc/tifm_core.c index 44d4475a09dd..0bd5349b0422 100644 --- a/drivers/misc/tifm_core.c +++ b/drivers/misc/tifm_core.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/idr.h> | 15 | #include <linux/idr.h> |
| 16 | #include <linux/module.h> | ||
| 16 | 17 | ||
| 17 | #define DRIVER_NAME "tifm_core" | 18 | #define DRIVER_NAME "tifm_core" |
| 18 | #define DRIVER_VERSION "0.8" | 19 | #define DRIVER_VERSION "0.8" |