summaryrefslogtreecommitdiff
path: root/target/linux/ifxmips/files/arch/mips
diff options
context:
space:
mode:
authorthl <thl@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-12-16 21:27:09 +0000
committerthl <thl@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-12-16 21:27:09 +0000
commitc1cb37da169ca63986e85ab1ef33c25fe4fb003d (patch)
tree2499ed0729440cb2a9c2d66d11a1a64161d7f801 /target/linux/ifxmips/files/arch/mips
parent73a104c025f3230baa7e6e01250ca8825ee4342f (diff)
[ifxmips] some correction (sorry, was compiling old files)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13670 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ifxmips/files/arch/mips')
-rw-r--r--target/linux/ifxmips/files/arch/mips/ifxmips/dma-core.c2
-rw-r--r--target/linux/ifxmips/files/arch/mips/ifxmips/reset.c2
-rw-r--r--target/linux/ifxmips/files/arch/mips/ifxmips/setup.c3
3 files changed, 4 insertions, 3 deletions
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>