diff options
author | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
---|---|---|
committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
commit | 8ef1bb539203629f77a61976e4f25415e1083bff (patch) | |
tree | 4fee25aca0928f112716fb02d27b1b355d0843b4 /drivers/isdn/hisax/hscx.c | |
parent | a3bcbbee83f55cbaec9b2ad748e7300c7feb2192 (diff) | |
parent | b91ce4d14a21fc04d165be30319541e0f9204f15 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/isdn/hisax/hscx.c')
-rw-r--r-- | drivers/isdn/hisax/hscx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/isdn/hisax/hscx.c b/drivers/isdn/hisax/hscx.c index c8f9951f7914..904b9100df95 100644 --- a/drivers/isdn/hisax/hscx.c +++ b/drivers/isdn/hisax/hscx.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include "isac.h" | 16 | #include "isac.h" |
17 | #include "isdnl1.h" | 17 | #include "isdnl1.h" |
18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
19 | #include <linux/slab.h> | ||
19 | 20 | ||
20 | static char *HSCXVer[] = | 21 | static char *HSCXVer[] = |
21 | {"A1", "?1", "A2", "?3", "A3", "V2.1", "?6", "?7", | 22 | {"A1", "?1", "A2", "?3", "A3", "V2.1", "?6", "?7", |