[ifxmips] 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 b334200cae18af0a39243af25c841860c9a38045..5271e6be44f00c8df3301aa31074e99d82540adc 100644 (file)
--- 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 5312948859b36c6b9b3faa87a8ddfb567eb45c11..0446b9747fa72ebdf74b1616b8845979ca5bfb7b 100644 (file)
--- 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 f36bb0572af7e031d468c1fba1ca8dd275e9d2d3..e571862a4748285a52bb8ba7603da45a923c5e81 100644 (file)
--- 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 bcf0f12c5205989d38c4385d45ea11d14c3b3649..8ba852a1eca469dddbfb9038dd57849f17dff8e8 100644 (file)
--- 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 4ff1ee0af7ef9c01dc4ccffdc58c1df18753f3ed..330c3cfd55bdb90a57f78c87b9fb65f7bfb8ff27 100644 (file)
--- 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);