diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /drivers/isdn/hisax/hscx.c | |
parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) |
Merge branch 'master' of /home/davem/src/GIT/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", |