[ar71xx] move definition of ar91xx_flash_platform_data into a separate header file...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16417 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
index 8564b01..111ea4a 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
@@ -14,13 +14,13 @@
 #include <linux/input.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/input.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>

-#include <linux/mtd/physmap.h>

 #include <linux/spi/spi.h>
 #include <linux/spi/spi_gpio.h>
 #include <linux/spi/vsc7385.h>
 
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_gpio.h>
 #include <linux/spi/vsc7385.h>
 
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include <asm/mach-ar71xx/ar91xx_flash.h>

 
 #include "devices.h"
 
 
 #include "devices.h"
 

diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h
new file mode 100644 (file)
index 0000000..05a93ec
--- /dev/null
+++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h
@@ -0,0 +1,26 @@
+/*
+ *  AR91xx parallel flash driver platform data definitions
+ *
+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#ifndef __AR91XX_FLASH_H
+#define __AR91XX_FLASH_H
+
+struct mtd_partition;
+
+struct ar91xx_flash_platform_data {
+       unsigned int            width;
+       u8                      is_shared:1;
+#ifdef CONFIG_MTD_PARTITIONS
+       unsigned int            nr_parts;
+       struct mtd_partition    *parts;
+#endif
+};
+
+#endif /* __AR91XX_FLASH_H */

diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h
index 5644fc9..55c62b7 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h
+++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h
@@ -16,8 +16,6 @@
 #include <linux/skbuff.h>
 #include <linux/phy.h>
 #include <linux/spi/spi.h>
 #include <linux/skbuff.h>
 #include <linux/phy.h>
 #include <linux/spi/spi.h>

-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>

 
 struct ag71xx_platform_data {
        phy_interface_t phy_if_mode;
 
 struct ag71xx_platform_data {
        phy_interface_t phy_if_mode;


@@ -53,13 +51,4 @@ struct ar71xx_spi_platform_data {
 #define AR71XX_SPI_CS_INACTIVE 0
 #define AR71XX_SPI_CS_ACTIVE   1
 
 #define AR71XX_SPI_CS_INACTIVE 0
 #define AR71XX_SPI_CS_ACTIVE   1
 

-struct ar91xx_flash_platform_data {
-       unsigned int            width;
-       u8                      is_shared:1;
-#ifdef CONFIG_MTD_PARTITIONS
-       unsigned int            nr_parts;
-       struct mtd_partition    *parts;
-#endif
-};
-

 #endif /* __ASM_MACH_AR71XX_PLATFORM_H */
 #endif /* __ASM_MACH_AR71XX_PLATFORM_H */

diff --git a/target/linux/ar71xx/files/drivers/mtd/maps/ar91xx_flash.c b/target/linux/ar71xx/files/drivers/mtd/maps/ar91xx_flash.c
index 7ee831c..1a55f4a 100644 (file)
--- a/target/linux/ar71xx/files/drivers/mtd/maps/ar91xx_flash.c
+++ b/target/linux/ar71xx/files/drivers/mtd/maps/ar91xx_flash.c
@@ -22,7 +22,7 @@
 #include <linux/io.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <linux/io.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>

-#include <asm/mach-ar71xx/platform.h>
+#include <asm/mach-ar71xx/ar91xx_flash.h>

 
 #define DRV_NAME       "ar91xx-flash"
 
 
 #define DRV_NAME       "ar91xx-flash"