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 /net/wimax | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'net/wimax')
| -rw-r--r-- | net/wimax/op-msg.c | 1 | ||||
| -rw-r--r-- | net/wimax/stack.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/wimax/op-msg.c b/net/wimax/op-msg.c index 7718657e93dc..d5b7c3779c43 100644 --- a/net/wimax/op-msg.c +++ b/net/wimax/op-msg.c | |||
| @@ -72,6 +72,7 @@ | |||
| 72 | * wimax_msg_send() | 72 | * wimax_msg_send() |
| 73 | */ | 73 | */ |
| 74 | #include <linux/device.h> | 74 | #include <linux/device.h> |
| 75 | #include <linux/slab.h> | ||
| 75 | #include <net/genetlink.h> | 76 | #include <net/genetlink.h> |
| 76 | #include <linux/netdevice.h> | 77 | #include <linux/netdevice.h> |
| 77 | #include <linux/wimax.h> | 78 | #include <linux/wimax.h> |
diff --git a/net/wimax/stack.c b/net/wimax/stack.c index 813e1eaea29b..1ed65dbdab03 100644 --- a/net/wimax/stack.c +++ b/net/wimax/stack.c | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | * wimax_rfkill_rm() | 51 | * wimax_rfkill_rm() |
| 52 | */ | 52 | */ |
| 53 | #include <linux/device.h> | 53 | #include <linux/device.h> |
| 54 | #include <linux/gfp.h> | ||
| 54 | #include <net/genetlink.h> | 55 | #include <net/genetlink.h> |
| 55 | #include <linux/netdevice.h> | 56 | #include <linux/netdevice.h> |
| 56 | #include <linux/wimax.h> | 57 | #include <linux/wimax.h> |