diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/isdn/mISDN/dsp_cmx.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/isdn/mISDN/dsp_cmx.c')
| -rw-r--r-- | drivers/isdn/mISDN/dsp_cmx.c | 1 |
1 files changed, 1 insertions, 0 deletions
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> |