From 2447415d4ec015433438fa42a07d08b60f611bae Mon Sep 17 00:00:00 2001 From: Luciano Coelho Date: Wed, 23 Jan 2013 16:40:34 +0200 Subject: [PATCH] --- yaml --- r: 352559 b: refs/heads/master c: 3a0a8d961e20132272887d9826738ce9b4d818f7 h: refs/heads/master i: 352557: 987ce38708f6bbe5b2d91f3d3dd4aba66ac504ad 352555: 691dc9e83c079314a7d3a1aadfd4ec5dbf988bc2 352551: 6fdbeaba9486e83c7f2c67d1cafa9d612615c41d 352543: 67c57d8f680fc0b10085e95d24c7fdc552c0e4a6 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ti/wlcore/main.c | 1 - trunk/drivers/net/wireless/ti/wlcore/wlcore.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e0cefb9180ef..426f3c97431d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9646b1346760a0af1035f0c59ba727fca1f5824d +refs/heads/master: 3a0a8d961e20132272887d9826738ce9b4d818f7 diff --git a/trunk/drivers/net/wireless/ti/wlcore/main.c b/trunk/drivers/net/wireless/ti/wlcore/main.c index e1dfdf94d0f7..9a66acf1205f 100644 --- a/trunk/drivers/net/wireless/ti/wlcore/main.c +++ b/trunk/drivers/net/wireless/ti/wlcore/main.c @@ -5995,7 +5995,6 @@ static void wlcore_nvs_cb(const struct firmware *fw, void *context) wl->irq = platform_get_irq(pdev, 0); wl->platform_quirks = pdata->platform_quirks; - wl->set_power = pdata->set_power; wl->if_ops = pdata->ops; if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ) diff --git a/trunk/drivers/net/wireless/ti/wlcore/wlcore.h b/trunk/drivers/net/wireless/ti/wlcore/wlcore.h index ebd8c6fad7cd..af9fecaefc30 100644 --- a/trunk/drivers/net/wireless/ti/wlcore/wlcore.h +++ b/trunk/drivers/net/wireless/ti/wlcore/wlcore.h @@ -183,7 +183,6 @@ struct wl1271 { struct wl1271_if_operations *if_ops; - void (*set_power)(bool enable); int irq; spinlock_t wl_lock;