summaryrefslogtreecommitdiff
path: root/drivers/uwb/i1480/i1480u-wlp/lc.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-04-08 11:06:12 +0400
committerIngo Molnar <mingo@elte.hu>2010-04-08 12:18:47 +0400
commitc1ab9cab75098924fa8226a8a371de66977439df (patch)
tree767e77302ca8f2eb781c60624bc8518cd50ba6eb /drivers/uwb/i1480/i1480u-wlp/lc.c
parentff0ff84a0767df48d728c36510365344a7e7d582 (diff)
parentf5284e7635787224dda1a2bf82a4c56b1c75671f (diff)
downloadlinux-c1ab9cab75098924fa8226a8a371de66977439df.tar.xz
Merge branch 'linus' into tracing/core
Conflicts: include/linux/module.h kernel/module.c Semantic conflict: include/trace/events/module.h Merge reason: Resolve the conflict with upstream commit 5fbfb18 ("Fix up possibly racy module refcounting") Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/uwb/i1480/i1480u-wlp/lc.c')
-rw-r--r--drivers/uwb/i1480/i1480u-wlp/lc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/uwb/i1480/i1480u-wlp/lc.c b/drivers/uwb/i1480/i1480u-wlp/lc.c
index f272dfe54d49..def778cf2216 100644
--- a/drivers/uwb/i1480/i1480u-wlp/lc.c
+++ b/drivers/uwb/i1480/i1480u-wlp/lc.c
@@ -55,6 +55,7 @@
* is being removed.
* i1480u_rm()
*/
+#include <linux/gfp.h>
#include <linux/if_arp.h>
#include <linux/etherdevice.h>