cw1200: move platform_data header to correct location.

(As suggested by Arnd Bergmann)

Signed-off-by: Solomon Peachy <pizza@shaftnet.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/cw1200/cw1200_sagrad.c b/drivers/net/wireless/cw1200/cw1200_sagrad.c
index a5ada0eda1dd8ee9db1b2f5bc2e282826eaca443..14c2a186b493e3f0105fff844cef235a17273a35 100644 (file)
--- a/drivers/net/wireless/cw1200/cw1200_sagrad.c
+++ b/drivers/net/wireless/cw1200/cw1200_sagrad.c
@@ -10,7 +10,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/cw1200_platform.h>
+#include <linux/platform_data/cw1200_platform.h>
 
 MODULE_AUTHOR("Solomon Peachy <speachy@sagrad.com>");
 MODULE_DESCRIPTION("ST-Ericsson CW1200 Platform glue driver");

diff --git a/drivers/net/wireless/cw1200/cw1200_sdio.c b/drivers/net/wireless/cw1200/cw1200_sdio.c
index 78c3bc55cd0b2c61d4bbd57bc12dcdb1dd1efafc..9f25ec5641fe59f9023d26b14fcc4fb0e1b72b9d 100644 (file)
--- a/drivers/net/wireless/cw1200/cw1200_sdio.c
+++ b/drivers/net/wireless/cw1200/cw1200_sdio.c
@@ -20,7 +20,7 @@
 
 #include "cw1200.h"
 #include "hwbus.h"
-#include <linux/cw1200_platform.h>
+#include <linux/platform_data/cw1200_platform.h>
 #include "hwio.h"
 
 MODULE_AUTHOR("Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no>");

diff --git a/drivers/net/wireless/cw1200/cw1200_spi.c b/drivers/net/wireless/cw1200/cw1200_spi.c
index 75efe54e495f0b8d8b556a54b01eb29b8b2ea62c..940e0947a5dcf454177571cb05a00e5f509a7c46 100644 (file)
--- a/drivers/net/wireless/cw1200/cw1200_spi.c
+++ b/drivers/net/wireless/cw1200/cw1200_spi.c
@@ -25,7 +25,7 @@
 
 #include "cw1200.h"
 #include "hwbus.h"
-#include <linux/cw1200_platform.h>
+#include <linux/platform_data/cw1200_platform.h>
 #include "hwio.h"
 
 MODULE_AUTHOR("Solomon Peachy <speachy@sagrad.com>");

diff --git a/include/linux/cw1200_platform.h b/include/linux/cw1200_platform.h
deleted file mode 100644 (file)
index c168fa5..0000000
--- a/include/linux/cw1200_platform.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2011
- *
- * Author: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>
- * License terms: GNU General Public License (GPL) version 2
- */
-
-#ifndef CW1200_PLAT_H_INCLUDED
-#define CW1200_PLAT_H_INCLUDED
-
-struct cw1200_platform_data_spi {
-       u8 spi_bits_per_word;           /* REQUIRED */
-       u16 ref_clk;                    /* REQUIRED (in KHz) */
-
-       /* All others are optional */
-       bool have_5ghz;
-       const struct resource *reset;   /* GPIO to RSTn signal */
-       const struct resource *powerup; /* GPIO to POWERUP signal */
-       int (*power_ctrl)(const struct cw1200_platform_data_spi *pdata,
-                         bool enable); /* Control 3v3 / 1v8 supply */
-       int (*clk_ctrl)(const struct cw1200_platform_data_spi *pdata,
-                       bool enable); /* Control CLK32K */
-       const u8 *macaddr;  /* if NULL, use cw1200_mac_template module parameter */
-       const char *sdd_file;  /* if NULL, will use default for detected hw type */
-};
-
-struct cw1200_platform_data_sdio {
-       u16 ref_clk;                    /* REQUIRED (in KHz) */
-
-       /* All others are optional */
-       const struct resource *irq;     /* if using GPIO for IRQ */
-       bool have_5ghz;
-       bool no_nptb;                   /* SDIO hardware does not support non-power-of-2-blocksizes */
-       const struct resource *reset;   /* GPIO to RSTn signal */
-       const struct resource *powerup; /* GPIO to POWERUP signal */
-       int (*power_ctrl)(const struct cw1200_platform_data_sdio *pdata,
-                         bool enable); /* Control 3v3 / 1v8 supply */
-       int (*clk_ctrl)(const struct cw1200_platform_data_sdio *pdata,
-                       bool enable); /* Control CLK32K */
-       const u8 *macaddr;  /* if NULL, use cw1200_mac_template module parameter */
-       const char *sdd_file;  /* if NULL, will use default for detected hw type */
-};
-
-const void *cw1200_get_platform_data(void);
-
-#endif /* CW1200_PLAT_H_INCLUDED */

diff --git a/include/linux/platform_data/cw1200_platform.h b/include/linux/platform_data/cw1200_platform.h
new file mode 100644 (file)
index 0000000..c168fa5
--- /dev/null
+++ b/include/linux/platform_data/cw1200_platform.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2011
+ *
+ * Author: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>
+ * License terms: GNU General Public License (GPL) version 2
+ */
+
+#ifndef CW1200_PLAT_H_INCLUDED
+#define CW1200_PLAT_H_INCLUDED
+
+struct cw1200_platform_data_spi {
+       u8 spi_bits_per_word;           /* REQUIRED */
+       u16 ref_clk;                    /* REQUIRED (in KHz) */
+
+       /* All others are optional */
+       bool have_5ghz;
+       const struct resource *reset;   /* GPIO to RSTn signal */
+       const struct resource *powerup; /* GPIO to POWERUP signal */
+       int (*power_ctrl)(const struct cw1200_platform_data_spi *pdata,
+                         bool enable); /* Control 3v3 / 1v8 supply */
+       int (*clk_ctrl)(const struct cw1200_platform_data_spi *pdata,
+                       bool enable); /* Control CLK32K */
+       const u8 *macaddr;  /* if NULL, use cw1200_mac_template module parameter */
+       const char *sdd_file;  /* if NULL, will use default for detected hw type */
+};
+
+struct cw1200_platform_data_sdio {
+       u16 ref_clk;                    /* REQUIRED (in KHz) */
+
+       /* All others are optional */
+       const struct resource *irq;     /* if using GPIO for IRQ */
+       bool have_5ghz;
+       bool no_nptb;                   /* SDIO hardware does not support non-power-of-2-blocksizes */
+       const struct resource *reset;   /* GPIO to RSTn signal */
+       const struct resource *powerup; /* GPIO to POWERUP signal */
+       int (*power_ctrl)(const struct cw1200_platform_data_sdio *pdata,
+                         bool enable); /* Control 3v3 / 1v8 supply */
+       int (*clk_ctrl)(const struct cw1200_platform_data_sdio *pdata,
+                       bool enable); /* Control CLK32K */
+       const u8 *macaddr;  /* if NULL, use cw1200_mac_template module parameter */
+       const char *sdd_file;  /* if NULL, will use default for detected hw type */
+};
+
+const void *cw1200_get_platform_data(void);
+
+#endif /* CW1200_PLAT_H_INCLUDED */