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/uwb/neh.c | |
parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/uwb/neh.c')
-rw-r--r-- | drivers/uwb/neh.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/uwb/neh.c b/drivers/uwb/neh.c index 78510a1f410d..697e56a5bcdd 100644 --- a/drivers/uwb/neh.c +++ b/drivers/uwb/neh.c | |||
@@ -83,6 +83,7 @@ | |||
83 | */ | 83 | */ |
84 | #include <linux/kernel.h> | 84 | #include <linux/kernel.h> |
85 | #include <linux/timer.h> | 85 | #include <linux/timer.h> |
86 | #include <linux/slab.h> | ||
86 | #include <linux/err.h> | 87 | #include <linux/err.h> |
87 | 88 | ||
88 | #include "uwb-internal.h" | 89 | #include "uwb-internal.h" |