diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:35:24 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:36:16 -0400 |
commit | b257c14ceb1194a6181144210056d38f22127189 (patch) | |
tree | c803925f1d5bf2237e7495d306bf43929df0c952 /drivers/isdn/mISDN | |
parent | 371fd7e7a56a5c136d31aa980011bd2f131c3ef5 (diff) | |
parent | 2ba3abd8186f24c7fb418927025b4e2120e3a362 (diff) |
Merge branch 'linus' into sched/core
Merge reason: merge the latest fixes, update to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/isdn/mISDN')
-rw-r--r-- | drivers/isdn/mISDN/clock.c | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/core.c | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/dsp_cmx.c | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/dsp_core.c | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/dsp_pipeline.c | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/dsp_tones.c | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/hwchannel.c | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/l1oip_core.c | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/layer1.c | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/layer2.c | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/socket.c | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/stack.c | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/tei.c | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/timerdev.c | 1 |
14 files changed, 14 insertions, 0 deletions
diff --git a/drivers/isdn/mISDN/clock.c b/drivers/isdn/mISDN/clock.c index f1bbc88763b2..1fa629b3b940 100644 --- a/drivers/isdn/mISDN/clock.c +++ b/drivers/isdn/mISDN/clock.c | |||
@@ -33,6 +33,7 @@ | |||
33 | * | 33 | * |
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include <linux/slab.h> | ||
36 | #include <linux/types.h> | 37 | #include <linux/types.h> |
37 | #include <linux/stddef.h> | 38 | #include <linux/stddef.h> |
38 | #include <linux/spinlock.h> | 39 | #include <linux/spinlock.h> |
diff --git a/drivers/isdn/mISDN/core.c b/drivers/isdn/mISDN/core.c index 21d34be5af6a..afeebb00fe0b 100644 --- a/drivers/isdn/mISDN/core.c +++ b/drivers/isdn/mISDN/core.c | |||
@@ -12,6 +12,7 @@ | |||
12 | * | 12 | * |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include <linux/slab.h> | ||
15 | #include <linux/types.h> | 16 | #include <linux/types.h> |
16 | #include <linux/stddef.h> | 17 | #include <linux/stddef.h> |
17 | #include <linux/module.h> | 18 | #include <linux/module.h> |
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c index 9c7c0d1ba55f..713ef2b805a2 100644 --- a/drivers/isdn/mISDN/dsp_cmx.c +++ b/drivers/isdn/mISDN/dsp_cmx.c | |||
@@ -124,6 +124,7 @@ | |||
124 | 124 | ||
125 | /* delay.h is required for hw_lock.h */ | 125 | /* delay.h is required for hw_lock.h */ |
126 | 126 | ||
127 | #include <linux/slab.h> | ||
127 | #include <linux/delay.h> | 128 | #include <linux/delay.h> |
128 | #include <linux/mISDNif.h> | 129 | #include <linux/mISDNif.h> |
129 | #include <linux/mISDNdsp.h> | 130 | #include <linux/mISDNdsp.h> |
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c index 6eac588e0a37..6f5b54864283 100644 --- a/drivers/isdn/mISDN/dsp_core.c +++ b/drivers/isdn/mISDN/dsp_core.c | |||
@@ -154,6 +154,7 @@ | |||
154 | */ | 154 | */ |
155 | 155 | ||
156 | #include <linux/delay.h> | 156 | #include <linux/delay.h> |
157 | #include <linux/gfp.h> | ||
157 | #include <linux/mISDNif.h> | 158 | #include <linux/mISDNif.h> |
158 | #include <linux/mISDNdsp.h> | 159 | #include <linux/mISDNdsp.h> |
159 | #include <linux/module.h> | 160 | #include <linux/module.h> |
diff --git a/drivers/isdn/mISDN/dsp_pipeline.c b/drivers/isdn/mISDN/dsp_pipeline.c index e9941678edfa..621f31007095 100644 --- a/drivers/isdn/mISDN/dsp_pipeline.c +++ b/drivers/isdn/mISDN/dsp_pipeline.c | |||
@@ -25,6 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
28 | #include <linux/slab.h> | ||
28 | #include <linux/list.h> | 29 | #include <linux/list.h> |
29 | #include <linux/string.h> | 30 | #include <linux/string.h> |
30 | #include <linux/mISDNif.h> | 31 | #include <linux/mISDNif.h> |
diff --git a/drivers/isdn/mISDN/dsp_tones.c b/drivers/isdn/mISDN/dsp_tones.c index 1debf53670de..7dbe54ed1deb 100644 --- a/drivers/isdn/mISDN/dsp_tones.c +++ b/drivers/isdn/mISDN/dsp_tones.c | |||
@@ -8,6 +8,7 @@ | |||
8 | * | 8 | * |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/gfp.h> | ||
11 | #include <linux/mISDNif.h> | 12 | #include <linux/mISDNif.h> |
12 | #include <linux/mISDNdsp.h> | 13 | #include <linux/mISDNdsp.h> |
13 | #include "core.h" | 14 | #include "core.h" |
diff --git a/drivers/isdn/mISDN/hwchannel.c b/drivers/isdn/mISDN/hwchannel.c index e8049be552aa..307bd6e8988b 100644 --- a/drivers/isdn/mISDN/hwchannel.c +++ b/drivers/isdn/mISDN/hwchannel.c | |||
@@ -15,6 +15,7 @@ | |||
15 | * | 15 | * |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include <linux/gfp.h> | ||
18 | #include <linux/module.h> | 19 | #include <linux/module.h> |
19 | #include <linux/mISDNhw.h> | 20 | #include <linux/mISDNhw.h> |
20 | 21 | ||
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index 325b1ad7d4b8..22f38e48ac4e 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c | |||
@@ -233,6 +233,7 @@ socket process and create a new one. | |||
233 | #include <linux/inet.h> | 233 | #include <linux/inet.h> |
234 | #include <linux/workqueue.h> | 234 | #include <linux/workqueue.h> |
235 | #include <linux/kthread.h> | 235 | #include <linux/kthread.h> |
236 | #include <linux/slab.h> | ||
236 | #include <net/sock.h> | 237 | #include <net/sock.h> |
237 | #include "core.h" | 238 | #include "core.h" |
238 | #include "l1oip.h" | 239 | #include "l1oip.h" |
diff --git a/drivers/isdn/mISDN/layer1.c b/drivers/isdn/mISDN/layer1.c index e826eeb1ecec..ac4aa18c632b 100644 --- a/drivers/isdn/mISDN/layer1.c +++ b/drivers/isdn/mISDN/layer1.c | |||
@@ -16,6 +16,7 @@ | |||
16 | */ | 16 | */ |
17 | 17 | ||
18 | 18 | ||
19 | #include <linux/slab.h> | ||
19 | #include <linux/module.h> | 20 | #include <linux/module.h> |
20 | #include <linux/mISDNhw.h> | 21 | #include <linux/mISDNhw.h> |
21 | #include "core.h" | 22 | #include "core.h" |
diff --git a/drivers/isdn/mISDN/layer2.c b/drivers/isdn/mISDN/layer2.c index e17f0044e0b6..c97371788764 100644 --- a/drivers/isdn/mISDN/layer2.c +++ b/drivers/isdn/mISDN/layer2.c | |||
@@ -16,6 +16,7 @@ | |||
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include <linux/mISDNif.h> | 18 | #include <linux/mISDNif.h> |
19 | #include <linux/slab.h> | ||
19 | #include "core.h" | 20 | #include "core.h" |
20 | #include "fsm.h" | 21 | #include "fsm.h" |
21 | #include "layer2.h" | 22 | #include "layer2.h" |
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c index fcfe17a19a61..3232206406b1 100644 --- a/drivers/isdn/mISDN/socket.c +++ b/drivers/isdn/mISDN/socket.c | |||
@@ -16,6 +16,7 @@ | |||
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include <linux/mISDNif.h> | 18 | #include <linux/mISDNif.h> |
19 | #include <linux/slab.h> | ||
19 | #include "core.h" | 20 | #include "core.h" |
20 | 21 | ||
21 | static u_int *debug; | 22 | static u_int *debug; |
diff --git a/drivers/isdn/mISDN/stack.c b/drivers/isdn/mISDN/stack.c index 0d05ec43012c..b159bd59e64e 100644 --- a/drivers/isdn/mISDN/stack.c +++ b/drivers/isdn/mISDN/stack.c | |||
@@ -15,6 +15,7 @@ | |||
15 | * | 15 | * |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include <linux/slab.h> | ||
18 | #include <linux/mISDNif.h> | 19 | #include <linux/mISDNif.h> |
19 | #include <linux/kthread.h> | 20 | #include <linux/kthread.h> |
20 | #include <linux/smp_lock.h> | 21 | #include <linux/smp_lock.h> |
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c index 6d4da6095885..34e898fe2f4f 100644 --- a/drivers/isdn/mISDN/tei.c +++ b/drivers/isdn/mISDN/tei.c | |||
@@ -16,6 +16,7 @@ | |||
16 | */ | 16 | */ |
17 | #include "layer2.h" | 17 | #include "layer2.h" |
18 | #include <linux/random.h> | 18 | #include <linux/random.h> |
19 | #include <linux/slab.h> | ||
19 | #include "core.h" | 20 | #include "core.h" |
20 | 21 | ||
21 | #define ID_REQUEST 1 | 22 | #define ID_REQUEST 1 |
diff --git a/drivers/isdn/mISDN/timerdev.c b/drivers/isdn/mISDN/timerdev.c index 5b7e9bf514f1..8785004e85e0 100644 --- a/drivers/isdn/mISDN/timerdev.c +++ b/drivers/isdn/mISDN/timerdev.c | |||
@@ -19,6 +19,7 @@ | |||
19 | 19 | ||
20 | #include <linux/poll.h> | 20 | #include <linux/poll.h> |
21 | #include <linux/vmalloc.h> | 21 | #include <linux/vmalloc.h> |
22 | #include <linux/slab.h> | ||
22 | #include <linux/timer.h> | 23 | #include <linux/timer.h> |
23 | #include <linux/miscdevice.h> | 24 | #include <linux/miscdevice.h> |
24 | #include <linux/module.h> | 25 | #include <linux/module.h> |