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/isdn | |
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/isdn')
-rw-r--r-- | drivers/isdn/capi/kcapi_proc.c | 1 | ||||
-rw-r--r-- | drivers/isdn/gigaset/asyncdata.c | 1 | ||||
-rw-r--r-- | drivers/isdn/gigaset/capi.c | 1 | ||||
-rw-r--r-- | drivers/isdn/gigaset/dummyll.c | 1 | ||||
-rw-r--r-- | drivers/isdn/gigaset/ev-layer.c | 1 | ||||
-rw-r--r-- | drivers/isdn/gigaset/i4l.c | 1 | ||||
-rw-r--r-- | drivers/isdn/gigaset/interface.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hardware/mISDN/mISDNisar.c | 1 | ||||
-rw-r--r-- | drivers/isdn/i4l/isdn_tty.c | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/clock.c | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/dsp_audio.c | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/dsp_pipeline.c | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/socket.c | 1 |
13 files changed, 13 insertions, 0 deletions
diff --git a/drivers/isdn/capi/kcapi_proc.c b/drivers/isdn/capi/kcapi_proc.c index ea2dff602e4..8d51cd1bf67 100644 --- a/drivers/isdn/capi/kcapi_proc.c +++ b/drivers/isdn/capi/kcapi_proc.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/proc_fs.h> | 14 | #include <linux/proc_fs.h> |
15 | #include <linux/seq_file.h> | 15 | #include <linux/seq_file.h> |
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/export.h> | ||
17 | 18 | ||
18 | static char *state2str(unsigned short state) | 19 | static char *state2str(unsigned short state) |
19 | { | 20 | { |
diff --git a/drivers/isdn/gigaset/asyncdata.c b/drivers/isdn/gigaset/asyncdata.c index c3b1dc3a13a..fddae72e3f9 100644 --- a/drivers/isdn/gigaset/asyncdata.c +++ b/drivers/isdn/gigaset/asyncdata.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include "gigaset.h" | 16 | #include "gigaset.h" |
17 | #include <linux/crc-ccitt.h> | 17 | #include <linux/crc-ccitt.h> |
18 | #include <linux/bitrev.h> | 18 | #include <linux/bitrev.h> |
19 | #include <linux/export.h> | ||
19 | 20 | ||
20 | /* check if byte must be stuffed/escaped | 21 | /* check if byte must be stuffed/escaped |
21 | * I'm not sure which data should be encoded. | 22 | * I'm not sure which data should be encoded. |
diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c index 658e75f18d0..6d5ceeece9f 100644 --- a/drivers/isdn/gigaset/capi.c +++ b/drivers/isdn/gigaset/capi.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/isdn/capilli.h> | 17 | #include <linux/isdn/capilli.h> |
18 | #include <linux/isdn/capicmd.h> | 18 | #include <linux/isdn/capicmd.h> |
19 | #include <linux/isdn/capiutil.h> | 19 | #include <linux/isdn/capiutil.h> |
20 | #include <linux/export.h> | ||
20 | 21 | ||
21 | /* missing from kernelcapi.h */ | 22 | /* missing from kernelcapi.h */ |
22 | #define CapiNcpiNotSupportedByProtocol 0x0001 | 23 | #define CapiNcpiNotSupportedByProtocol 0x0001 |
diff --git a/drivers/isdn/gigaset/dummyll.c b/drivers/isdn/gigaset/dummyll.c index bd0b1eaa757..19b1c779d50 100644 --- a/drivers/isdn/gigaset/dummyll.c +++ b/drivers/isdn/gigaset/dummyll.c | |||
@@ -11,6 +11,7 @@ | |||
11 | * ===================================================================== | 11 | * ===================================================================== |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/export.h> | ||
14 | #include "gigaset.h" | 15 | #include "gigaset.h" |
15 | 16 | ||
16 | void gigaset_skb_sent(struct bc_state *bcs, struct sk_buff *skb) | 17 | void gigaset_skb_sent(struct bc_state *bcs, struct sk_buff *skb) |
diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c index ba74646cf0e..6d12623c1db 100644 --- a/drivers/isdn/gigaset/ev-layer.c +++ b/drivers/isdn/gigaset/ev-layer.c | |||
@@ -13,6 +13,7 @@ | |||
13 | * ===================================================================== | 13 | * ===================================================================== |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/export.h> | ||
16 | #include "gigaset.h" | 17 | #include "gigaset.h" |
17 | 18 | ||
18 | /* ========================================================== */ | 19 | /* ========================================================== */ |
diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c index 9bec8b96996..04231cb2f03 100644 --- a/drivers/isdn/gigaset/i4l.c +++ b/drivers/isdn/gigaset/i4l.c | |||
@@ -15,6 +15,7 @@ | |||
15 | 15 | ||
16 | #include "gigaset.h" | 16 | #include "gigaset.h" |
17 | #include <linux/isdnif.h> | 17 | #include <linux/isdnif.h> |
18 | #include <linux/export.h> | ||
18 | 19 | ||
19 | #define SBUFSIZE 4096 /* sk_buff payload size */ | 20 | #define SBUFSIZE 4096 /* sk_buff payload size */ |
20 | #define TRANSBUFSIZE 768 /* bytes per skb for transparent receive */ | 21 | #define TRANSBUFSIZE 768 /* bytes per skb for transparent receive */ |
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c index e35058bcd7b..ee0a549a933 100644 --- a/drivers/isdn/gigaset/interface.c +++ b/drivers/isdn/gigaset/interface.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include "gigaset.h" | 14 | #include "gigaset.h" |
15 | #include <linux/gigaset_dev.h> | 15 | #include <linux/gigaset_dev.h> |
16 | #include <linux/tty_flip.h> | 16 | #include <linux/tty_flip.h> |
17 | #include <linux/module.h> | ||
17 | 18 | ||
18 | /*** our ioctls ***/ | 19 | /*** our ioctls ***/ |
19 | 20 | ||
diff --git a/drivers/isdn/hardware/mISDN/mISDNisar.c b/drivers/isdn/hardware/mISDN/mISDNisar.c index d13fa5b119f..7034af28d46 100644 --- a/drivers/isdn/hardware/mISDN/mISDNisar.c +++ b/drivers/isdn/hardware/mISDN/mISDNisar.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
30 | #include <linux/vmalloc.h> | 30 | #include <linux/vmalloc.h> |
31 | #include <linux/mISDNhw.h> | 31 | #include <linux/mISDNhw.h> |
32 | #include <linux/module.h> | ||
32 | #include "isar.h" | 33 | #include "isar.h" |
33 | 34 | ||
34 | #define ISAR_REV "2.1" | 35 | #define ISAR_REV "2.1" |
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c index e5546cb3ac6..2c26b64ebbe 100644 --- a/drivers/isdn/i4l/isdn_tty.c +++ b/drivers/isdn/i4l/isdn_tty.c | |||
@@ -750,6 +750,7 @@ isdn_tty_modem_hup(modem_info * info, int local) | |||
750 | * supplementary service (CAPI 2.0 part III) | 750 | * supplementary service (CAPI 2.0 part III) |
751 | */ | 751 | */ |
752 | #include <linux/isdn/capicmd.h> | 752 | #include <linux/isdn/capicmd.h> |
753 | #include <linux/module.h> | ||
753 | 754 | ||
754 | int | 755 | int |
755 | isdn_tty_capi_facility(capi_msg *cm) { | 756 | isdn_tty_capi_facility(capi_msg *cm) { |
diff --git a/drivers/isdn/mISDN/clock.c b/drivers/isdn/mISDN/clock.c index 1fa629b3b94..7418f2d811d 100644 --- a/drivers/isdn/mISDN/clock.c +++ b/drivers/isdn/mISDN/clock.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <linux/stddef.h> | 38 | #include <linux/stddef.h> |
39 | #include <linux/spinlock.h> | 39 | #include <linux/spinlock.h> |
40 | #include <linux/mISDNif.h> | 40 | #include <linux/mISDNif.h> |
41 | #include <linux/export.h> | ||
41 | #include "core.h" | 42 | #include "core.h" |
42 | 43 | ||
43 | static u_int *debug; | 44 | static u_int *debug; |
diff --git a/drivers/isdn/mISDN/dsp_audio.c b/drivers/isdn/mISDN/dsp_audio.c index 9c7c6451bf3..b8f18bd09e4 100644 --- a/drivers/isdn/mISDN/dsp_audio.c +++ b/drivers/isdn/mISDN/dsp_audio.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
13 | #include <linux/mISDNif.h> | 13 | #include <linux/mISDNif.h> |
14 | #include <linux/mISDNdsp.h> | 14 | #include <linux/mISDNdsp.h> |
15 | #include <linux/export.h> | ||
15 | #include "core.h" | 16 | #include "core.h" |
16 | #include "dsp.h" | 17 | #include "dsp.h" |
17 | 18 | ||
diff --git a/drivers/isdn/mISDN/dsp_pipeline.c b/drivers/isdn/mISDN/dsp_pipeline.c index 621f3100709..b6c9a588934 100644 --- a/drivers/isdn/mISDN/dsp_pipeline.c +++ b/drivers/isdn/mISDN/dsp_pipeline.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/string.h> | 30 | #include <linux/string.h> |
31 | #include <linux/mISDNif.h> | 31 | #include <linux/mISDNif.h> |
32 | #include <linux/mISDNdsp.h> | 32 | #include <linux/mISDNdsp.h> |
33 | #include <linux/export.h> | ||
33 | #include "dsp.h" | 34 | #include "dsp.h" |
34 | #include "dsp_hwec.h" | 35 | #include "dsp_hwec.h" |
35 | 36 | ||
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c index 8e325227b4c..738ea8dd0ad 100644 --- a/drivers/isdn/mISDN/socket.c +++ b/drivers/isdn/mISDN/socket.c | |||
@@ -17,6 +17,7 @@ | |||
17 | 17 | ||
18 | #include <linux/mISDNif.h> | 18 | #include <linux/mISDNif.h> |
19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
20 | #include <linux/export.h> | ||
20 | #include "core.h" | 21 | #include "core.h" |
21 | 22 | ||
22 | static u_int *debug; | 23 | static u_int *debug; |