From ca9dee55b2aefe2067ebf637d16689203f5102f5 Mon Sep 17 00:00:00 2001
From: Ohad Ben-Cohen <ohad@wizery.com>
Date: Thu, 16 Sep 2010 13:16:02 +0200
Subject: [PATCH] --- yaml --- r: 214711 b: refs/heads/master c:
 c1f9a095600e07fefe64eb94eb711f410100824a h: refs/heads/master i:   214709:
 d87c1080bcebfbaf0ea5d2511c5de519c276d339   214707:
 43bdf040bdcdfc89fa66fcfe47763b3a6a6beb2f   214703:
 ee9cd6c00451e14d717487b0aa09ed68e8a7607d v: v3

---
 [refs]                                             | 2 +-
 trunk/MAINTAINERS                                  | 2 +-
 trunk/arch/arm/mach-omap2/board-omap3pandora.c     | 1 +
 trunk/arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
 trunk/drivers/net/wireless/wl12xx/wl1251_sdio.c    | 2 +-
 trunk/drivers/net/wireless/wl12xx/wl1251_spi.c     | 2 +-
 trunk/drivers/net/wireless/wl12xx/wl1271_spi.c     | 2 +-
 trunk/include/linux/{spi => }/wl12xx.h             | 4 ++--
 8 files changed, 9 insertions(+), 8 deletions(-)
 rename trunk/include/linux/{spi => }/wl12xx.h (94%)

diff --git a/[refs] b/[refs]
index 32bf2492facb..5d946b1cfe47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09f250ac8faefa9deb14854e4715a139ed99617b
+refs/heads/master: c1f9a095600e07fefe64eb94eb711f410100824a
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 80cea03a737e..e9aec08e575a 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -6324,7 +6324,7 @@ W:	http://wireless.kernel.org
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:	Maintained
 F:	drivers/net/wireless/wl12xx/wl1271*
-F:	include/linux/spi/wl12xx.h
+F:	include/linux/wl12xx.h
 
 WL3501 WIRELESS PCMCIA CARD DRIVER
 M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
diff --git a/trunk/arch/arm/mach-omap2/board-omap3pandora.c b/trunk/arch/arm/mach-omap2/board-omap3pandora.c
index c0f4f12eba54..9b62b6283c6e 100644
--- a/trunk/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/trunk/arch/arm/mach-omap2/board-omap3pandora.c
@@ -25,6 +25,7 @@
 #include <linux/spi/ads7846.h>
 #include <linux/regulator/machine.h>
 #include <linux/i2c/twl.h>
+#include <linux/wl12xx.h>
 #include <linux/leds.h>
 #include <linux/input.h>
 #include <linux/input/matrix_keypad.h>
diff --git a/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c b/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
index 03483920ed6e..1cf994299cbe 100644
--- a/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -14,7 +14,7 @@
 #include <linux/input.h>
 #include <linux/input/matrix_keypad.h>
 #include <linux/spi/spi.h>
-#include <linux/spi/wl12xx.h>
+#include <linux/wl12xx.h>
 #include <linux/i2c.h>
 #include <linux/i2c/twl.h>
 #include <linux/clk.h>
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1251_sdio.c b/trunk/drivers/net/wireless/wl12xx/wl1251_sdio.c
index c0b68b0a9aa8..74ba9ced5393 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1251_sdio.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1251_sdio.c
@@ -24,7 +24,7 @@
 #include <linux/mmc/sdio_func.h>
 #include <linux/mmc/sdio_ids.h>
 #include <linux/platform_device.h>
-#include <linux/spi/wl12xx.h>
+#include <linux/wl12xx.h>
 #include <linux/irq.h>
 
 #include "wl1251.h"
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1251_spi.c b/trunk/drivers/net/wireless/wl12xx/wl1251_spi.c
index 334ded9881c0..320de79667a6 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1251_spi.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1251_spi.c
@@ -24,7 +24,7 @@
 #include <linux/slab.h>
 #include <linux/crc7.h>
 #include <linux/spi/spi.h>
-#include <linux/spi/wl12xx.h>
+#include <linux/wl12xx.h>
 
 #include "wl1251.h"
 #include "wl1251_reg.h"
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_spi.c b/trunk/drivers/net/wireless/wl12xx/wl1271_spi.c
index 4cb99c541e2a..c3fdab75ad2a 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_spi.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_spi.c
@@ -25,7 +25,7 @@
 #include <linux/module.h>
 #include <linux/crc7.h>
 #include <linux/spi/spi.h>
-#include <linux/spi/wl12xx.h>
+#include <linux/wl12xx.h>
 #include <linux/slab.h>
 
 #include "wl1271.h"
diff --git a/trunk/include/linux/spi/wl12xx.h b/trunk/include/linux/wl12xx.h
similarity index 94%
rename from trunk/include/linux/spi/wl12xx.h
rename to trunk/include/linux/wl12xx.h
index a20bccf0b5c2..015687a1776d 100644
--- a/trunk/include/linux/spi/wl12xx.h
+++ b/trunk/include/linux/wl12xx.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef _LINUX_SPI_WL12XX_H
-#define _LINUX_SPI_WL12XX_H
+#ifndef _LINUX_WL12XX_H
+#define _LINUX_WL12XX_H
 
 struct wl12xx_platform_data {
 	void (*set_power)(bool enable);