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 / wl1251.h

diff --git a/drivers/net/wireless/wl1251/wl1251.h b/drivers/net/wireless/wl1251/wl1251.h
index e113d4c1fb357924d20a342d4ec214b6fde33c85..c0ce2c8b43b8715fbb2c502f4c5bce710e901da7 100644 (file)
--- a/drivers/net/wireless/wl1251/wl1251.h
+++ b/drivers/net/wireless/wl1251/wl1251.h
@@ -256,6 +256,7 @@ struct wl1251_if_operations {
        void (*write)(struct wl1251 *wl, int addr, void *buf, size_t len);
        void (*read_elp)(struct wl1251 *wl, int addr, u32 *val);
        void (*write_elp)(struct wl1251 *wl, int addr, u32 val);
+       int  (*power)(struct wl1251 *wl, bool enable);
        void (*reset)(struct wl1251 *wl);
        void (*enable_irq)(struct wl1251 *wl);
        void (*disable_irq)(struct wl1251 *wl);
@@ -418,7 +419,7 @@ void wl1251_disable_interrupts(struct wl1251 *wl);
 #define WL1251_FW_NAME "wl1251-fw.bin"
 #define WL1251_NVS_NAME "wl1251-nvs.bin"
 
-#define WL1251_POWER_ON_SLEEP 10 /* in miliseconds */
+#define WL1251_POWER_ON_SLEEP 10 /* in milliseconds */
 
 #define WL1251_PART_DOWN_MEM_START     0x0
 #define WL1251_PART_DOWN_MEM_SIZE      0x16800