Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / wireless / wl1251 / spi.c

diff --git a/drivers/net/wireless/wl1251/spi.c b/drivers/net/wireless/wl1251/spi.c
index 88fa8e69d0d1d30b06c76a64cdc8d00f5592754a..ac872b38960f7a1d47089ba9f754b5c37aa7e2f5 100644 (file)
--- a/drivers/net/wireless/wl1251/spi.c
+++ b/drivers/net/wireless/wl1251/spi.c
@@ -215,12 +215,21 @@ static void wl1251_spi_disable_irq(struct wl1251 *wl)
        return disable_irq(wl->irq);
 }
 
+static int wl1251_spi_set_power(struct wl1251 *wl, bool enable)
+{
+       if (wl->set_power)
+               wl->set_power(enable);
+
+       return 0;
+}
+
 static const struct wl1251_if_operations wl1251_spi_ops = {
        .read = wl1251_spi_read,
        .write = wl1251_spi_write,
        .reset = wl1251_spi_reset_wake,
        .enable_irq = wl1251_spi_enable_irq,
        .disable_irq = wl1251_spi_disable_irq,
+       .power = wl1251_spi_set_power,
 };
 
 static int __devinit wl1251_spi_probe(struct spi_device *spi)