diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-08-04 16:05:07 +0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-04 16:05:07 +0400 |
| commit | 7a996d3ab150bb0e1b71fa182f70199a703efdd1 (patch) | |
| tree | 96a36947d90c9b96580899abd38cb3b70cd9d40b /net/ieee802154/netlink.c | |
| parent | 7cf3d73b4360e91b14326632ab1aeda4cb26308d (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
| download | linux-7a996d3ab150bb0e1b71fa182f70199a703efdd1.tar.xz | |
Merge commit 'v2.6.35' into kbuild/kconfig
Conflicts:
scripts/kconfig/Makefile
Diffstat (limited to 'net/ieee802154/netlink.c')
| -rw-r--r-- | net/ieee802154/netlink.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ieee802154/netlink.c b/net/ieee802154/netlink.c index 33137b99e471..c8097ae2482f 100644 --- a/net/ieee802154/netlink.c +++ b/net/ieee802154/netlink.c @@ -23,6 +23,7 @@ */ #include <linux/kernel.h> +#include <linux/gfp.h> #include <net/genetlink.h> #include <linux/nl802154.h> |