diff options
author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
tree | fcf504879883763557e696eff81427b1ab78f76b /drivers/isdn/hardware/avm/t1isa.c | |
parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/isdn/hardware/avm/t1isa.c')
-rw-r--r-- | drivers/isdn/hardware/avm/t1isa.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/isdn/hardware/avm/t1isa.c b/drivers/isdn/hardware/avm/t1isa.c index baeeb3c2a3ee..08216b14be13 100644 --- a/drivers/isdn/hardware/avm/t1isa.c +++ b/drivers/isdn/hardware/avm/t1isa.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/kernelcapi.h> | 21 | #include <linux/kernelcapi.h> |
22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
24 | #include <linux/gfp.h> | ||
24 | #include <asm/io.h> | 25 | #include <asm/io.h> |
25 | #include <linux/isdn/capicmd.h> | 26 | #include <linux/isdn/capicmd.h> |
26 | #include <linux/isdn/capiutil.h> | 27 | #include <linux/isdn/capiutil.h> |