From 1a8b891a732f58c3e0a214f6e10ae0b1f1cad582 Mon Sep 17 00:00:00 2001
From: Luciano Coelho <coelho@ti.com>
Date: Thu, 3 May 2012 10:31:02 +0300
Subject: [PATCH] --- yaml --- r: 306701 b: refs/heads/master c:
 fd492ed7898570c744b2fe0d5856f11a043c66a7 h: refs/heads/master i:   306699:
 2adc7f0ae2eecd654a2b879f33f0a31c3535e1ca v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ti/wlcore/boot.c | 2 +-
 trunk/drivers/net/wireless/ti/wlcore/main.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d8d5efc80b6c..91edd841119c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03bed29e0501b5757ce62ebdb01829f7bd8d9819
+refs/heads/master: fd492ed7898570c744b2fe0d5856f11a043c66a7
diff --git a/trunk/drivers/net/wireless/ti/wlcore/boot.c b/trunk/drivers/net/wireless/ti/wlcore/boot.c
index 3a2207db5405..eb204ba97935 100644
--- a/trunk/drivers/net/wireless/ti/wlcore/boot.c
+++ b/trunk/drivers/net/wireless/ti/wlcore/boot.c
@@ -72,7 +72,7 @@ static int wlcore_boot_fw_version(struct wl1271 *wl)
 	struct wl1271_static_data *static_data;
 	int ret;
 
-	static_data = kmalloc(sizeof(*static_data), GFP_DMA);
+	static_data = kmalloc(sizeof(*static_data), GFP_KERNEL | GFP_DMA);
 	if (!static_data) {
 		wl1271_error("Couldn't allocate memory for static data!");
 		return -ENOMEM;
diff --git a/trunk/drivers/net/wireless/ti/wlcore/main.c b/trunk/drivers/net/wireless/ti/wlcore/main.c
index 2b0f987660c6..b156bc666086 100644
--- a/trunk/drivers/net/wireless/ti/wlcore/main.c
+++ b/trunk/drivers/net/wireless/ti/wlcore/main.c
@@ -4861,7 +4861,7 @@ struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size)
 		goto err_dummy_packet;
 	}
 
-	wl->mbox = kmalloc(sizeof(*wl->mbox), GFP_DMA);
+	wl->mbox = kmalloc(sizeof(*wl->mbox), GFP_KERNEL | GFP_DMA);
 	if (!wl->mbox) {
 		ret = -ENOMEM;
 		goto err_fwlog;