diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /net/wimax | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
Merge branch 'master' into for-next
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> |