Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4181/osprey
In directory usw-pr-cvs1:/tmp/cvs-serv2451
Modified Files:
Makefile setup.c
Added Files:
irq.c
Removed Files:
reset.c
Log Message:
Use the generic reset routines.
--- NEW FILE: irq.c ---
/*
* arch/mips/vr41xx/vr4181/osprey/irq.c
*
* Interrupt routines for the NEC Osprey
*
* Copyright (C) 2002 Paul Mundt <le...@ch...>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*/
#include <linux/init.h>
void __init vr41xx_board_irq_init(void)
{
}
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4181/osprey/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 14 Jun 2002 13:55:59 -0000 1.1
+++ Makefile 14 Jun 2002 14:12:19 -0000 1.2
@@ -13,7 +13,7 @@
O_TARGET := osprey.o
-obj-y := setup.o prom.o reset.o
+obj-y := setup.o prom.o irq.o
obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4181/osprey/setup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setup.c 14 Jun 2002 14:01:52 -0000 1.2
+++ setup.c 14 Jun 2002 14:12:19 -0000 1.3
@@ -21,14 +21,9 @@
#include <linux/init.h>
#include <linux/delay.h>
#include <asm/reboot.h>
-#include <asm/vr4181/vr4181.h>
+#include <asm/vr41xx.h>
#include <asm/io.h>
-
-extern void nec_osprey_restart(char* c);
-extern void nec_osprey_halt(void);
-extern void nec_osprey_power_off(void);
-
extern void vr4181_init_serial(void);
extern void vr4181_init_time(void);
@@ -48,9 +43,9 @@
conswitchp = &dummy_con;
#endif
- _machine_restart = nec_osprey_restart;
- _machine_halt = nec_osprey_halt;
- _machine_power_off = nec_osprey_power_off;
+ _machine_restart = nec_vr41xx_restart;
+ _machine_halt = nec_vr41xx_halt;
+ _machine_power_off = nec_vr41xx_power_off;
/* setup resource limit */
ioport_resource.end = 0xffffffff;
--- reset.c DELETED ---
|
