From aaf52c0c7d2db474a009706cdabc48f6ca90a0aa Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Thu, 8 Oct 2009 22:24:49 +0000
Subject: ifxmips: move header files, split up patches, rename some files

SVN-Revision: 18010
---
 target/linux/ifxmips/files/drivers/leds/leds-ifxmips.c    | 6 +++---
 target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c     | 8 ++++----
 target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c     | 8 +++++---
 target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c   | 4 ++--
 target/linux/ifxmips/files/drivers/watchdog/ifxmips_wdt.c | 4 ++--
 5 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'target/linux/ifxmips/files/drivers')

diff --git a/target/linux/ifxmips/files/drivers/leds/leds-ifxmips.c b/target/linux/ifxmips/files/drivers/leds/leds-ifxmips.c
index 86116d6548..3123d82180 100644
--- a/target/linux/ifxmips/files/drivers/leds/leds-ifxmips.c
+++ b/target/linux/ifxmips/files/drivers/leds/leds-ifxmips.c
@@ -31,9 +31,9 @@
 #include <linux/leds.h>
 #include <linux/delay.h>
 
-#include <asm/ifxmips/ifxmips.h>
-#include <asm/ifxmips/ifxmips_gpio.h>
-#include <asm/ifxmips/ifxmips_pmu.h>
+#include <ifxmips.h>
+#include <ifxmips_gpio.h>
+#include <ifxmips_pmu.h>
 
 #define DRVNAME					"ifxmips_led"
 
diff --git a/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c b/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c
index 6498d12cb1..3a3569ac8a 100644
--- a/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c
+++ b/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c
@@ -29,9 +29,9 @@
 #include <linux/magic.h>
 #include <linux/platform_device.h>
 
-#include <asm/ifxmips/ifxmips.h>
-#include <asm/ifxmips/ifxmips_prom.h>
-#include <asm/ifxmips/ifxmips_ebu.h>
+#include <ifxmips.h>
+#include <ifxmips_prom.h>
+#include <ifxmips_ebu.h>
 
 #ifndef CONFIG_MTD_PARTITIONS
 #error Please enable CONFIG_MTD_PARTITIONS
@@ -244,7 +244,7 @@ static int ifxmips_mtd_probe(struct platform_device *dev)
 	add_mtd_partitions(ifxmips_mtd, &ifxmips_meta_partition, 1);
 
 	printk(KERN_INFO "ifxmips_mtd: added %s flash with %dMB\n",
-		ifxmips_map.name, ifxmips_mtd->size >> 20);
+		ifxmips_map.name, ifxmips_mtd->size);
 	return 0;
 }
 
diff --git a/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c b/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c
index 43fe73551b..9af0e385ad 100644
--- a/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c
+++ b/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c
@@ -34,10 +34,12 @@
 #include <linux/ethtool.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+
 #include <asm/checksum.h>
-#include <asm/ifxmips/ifxmips.h>
-#include <asm/ifxmips/ifxmips_dma.h>
-#include <asm/ifxmips/ifxmips_pmu.h>
+
+#include <ifxmips.h>
+#include <ifxmips_dma.h>
+#include <ifxmips_pmu.h>
 
 struct ifxmips_mii_priv {
 	struct net_device_stats stats;
diff --git a/target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c b/target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c
index d6bf1803f9..55bf41adaf 100644
--- a/target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c
+++ b/target/linux/ifxmips/files/drivers/serial/ifxmips_asc.c
@@ -48,8 +48,8 @@
 
 #include <asm/system.h>
 
-#include <asm/ifxmips/ifxmips.h>
-#include <asm/ifxmips/ifxmips_irq.h>
+#include <ifxmips.h>
+#include <ifxmips_irq.h>
 
 #define PORT_IFXMIPSASC  111
 
diff --git a/target/linux/ifxmips/files/drivers/watchdog/ifxmips_wdt.c b/target/linux/ifxmips/files/drivers/watchdog/ifxmips_wdt.c
index d75eeeac20..b06307cb76 100644
--- a/target/linux/ifxmips/files/drivers/watchdog/ifxmips_wdt.c
+++ b/target/linux/ifxmips/files/drivers/watchdog/ifxmips_wdt.c
@@ -25,8 +25,8 @@
 #include <linux/platform_device.h>
 #include <linux/uaccess.h>
 
-#include <asm/mach-ifxmips/cgu.h>
-#include <asm/ifxmips/ifxmips.h>
+#include <ifxmips.h>
+#include <ifxmips_cgu.h>
 
 #define IFXMIPS_WDT_PW1			0x00BE0000
 #define IFXMIPS_WDT_PW2			0x00DC0000
-- 
cgit v1.2.3