Merge branch 'master' into for-davem

[mv-sheeva.git] / drivers / net / wireless / orinoco / scan.c

diff --git a/drivers/net/wireless/orinoco/scan.c b/drivers/net/wireless/orinoco/scan.c
index e97a95bacb7ea4d2615d1d4b72d73c531e48b5fd..4300d9db7d8caab2d70442b7cbd37a9da69adef9 100644 (file)
--- a/drivers/net/wireless/orinoco/scan.c
+++ b/drivers/net/wireless/orinoco/scan.c
@@ -3,6 +3,7 @@
  * See copyright notice in main.c
  */
 
+#include <linux/gfp.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/ieee80211.h>