From: Thomas Langer <thomas.langer@lantiq.com>
Date: Tue, 16 Dec 2008 21:27:09 +0000 (+0000)
Subject: some correction (sorry, was compiling old files)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5b2ba181e4af83f38d2a293deccdfa1bd7670384;p=openwrt%2Fstaging%2Fnbd.git

some correction (sorry, was compiling old files)

SVN-Revision: 13670
---

diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/dma-core.c b/target/linux/ifxmips/files/arch/mips/ifxmips/dma-core.c
index b334200cae..5271e6be44 100644
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/dma-core.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/dma-core.c
@@ -552,7 +552,7 @@ int map_dma_chan(struct dma_chan_map *map)
 	int result;
 
 	for (i = 0; i < MAX_DMA_DEVICE_NUM; i++)
-		dma_devs[i].device_name = &global_device_name[i];
+		strcpy(dma_devs[i].device_name, global_device_name[i]);
 
 	for (i = 0; i < MAX_DMA_CHANNEL_NUM; i++) {
 		dma_chan[i].irq = map[i].irq;
diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c b/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c
index 5312948859..0446b9747f 100644
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c
@@ -18,8 +18,8 @@
 
 #include <linux/kernel.h>
 #include <linux/pm.h>
-#include <linux/reboot.h>
 #include <linux/io.h>
+#include <asm/reboot.h>
 #include <asm/system.h>
 #include <asm/ifxmips/ifxmips.h>
 
diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/setup.c b/target/linux/ifxmips/files/arch/mips/ifxmips/setup.c
index f36bb0572a..e571862a47 100644
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/setup.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/setup.c
@@ -19,9 +19,10 @@
 
 #include <linux/init.h>
 
-#include <linux/time.h>
+
 #include <linux/cpu.h>
 
+#include <asm/time.h>
 #include <asm/traps.h>
 #include <asm/irq.h>
 #include <asm/bootinfo.h>
diff --git a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_dma.h b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_dma.h
index bcf0f12c52..8ba852a1ec 100644
--- a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_dma.h
+++ b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_dma.h
@@ -163,7 +163,7 @@ struct dma_channel_info {
 
 struct dma_device_info {
 	/* device name of this peripheral */
-	const char *device_name;
+	char device_name[15];
 	int reserved;
 	int tx_burst_len;
 	int rx_burst_len;
diff --git a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_gptu.h b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_gptu.h
index 4ff1ee0af7..330c3cfd55 100644
--- a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_gptu.h
+++ b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_gptu.h
@@ -141,7 +141,7 @@ struct gptu_ioctl_param {
  */
 typedef void (*timer_callback)(unsigned long arg);
 
-xtern int ifxmips_request_timer(unsigned int, unsigned int, unsigned long, unsigned long, unsigned long);
+extern int ifxmips_request_timer(unsigned int, unsigned int, unsigned long, unsigned long, unsigned long);
 extern int ifxmips_free_timer(unsigned int);
 extern int ifxmips_start_timer(unsigned int, int);
 extern int ifxmips_stop_timer(unsigned int);