git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
mips
/
dec
/
setup.c
diff --git
a/arch/mips/dec/setup.c
b/arch/mips/dec/setup.c
index
83b079a
..
6a69309
100644
(file)
--- a/
arch/mips/dec/setup.c
+++ b/
arch/mips/dec/setup.c
@@
-8,7
+8,6
@@
* Copyright (C) 1998 Harald Koerfgen
* Copyright (C) 2000, 2001, 2002, 2003 Maciej W. Rozycki
*/
* Copyright (C) 1998 Harald Koerfgen
* Copyright (C) 2000, 2001, 2002, 2003 Maciej W. Rozycki
*/
-#include <linux/config.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/param.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/param.h>
@@
-48,11
+47,6
@@
extern irqreturn_t dec_intr_halt(int irq, void *dev_id, struct pt_regs *regs);
extern asmlinkage void decstation_handle_int(void);
extern asmlinkage void decstation_handle_int(void);
-#ifdef CONFIG_BLK_DEV_INITRD
-extern unsigned long initrd_start, initrd_end;
-extern void * __rd_start, * __rd_end;
-#endif
-
spinlock_t ioasic_ssr_lock;
volatile u32 *ioasic_base;
spinlock_t ioasic_ssr_lock;
volatile u32 *ioasic_base;
@@
-136,11
+130,6
@@
extern void dec_timer_setup(struct irqaction *);
static void __init decstation_setup(void)
{
static void __init decstation_setup(void)
{
-#ifdef CONFIG_BLK_DEV_INITRD
- ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
- initrd_start = (unsigned long)&__rd_start;
- initrd_end = (unsigned long)&__rd_end;
-#endif
board_be_init = dec_be_init;
board_time_init = dec_time_init;
board_timer_setup = dec_timer_setup;
board_be_init = dec_be_init;
board_time_init = dec_time_init;
board_timer_setup = dec_timer_setup;
@@
-701,7
+690,7
@@
void __init dec_init_kn03(void)
} /* dec_init_kn03 */
} /* dec_init_kn03 */
-void __init
init_IRQ
(void)
+void __init
arch_init_irq
(void)
{
switch (mips_machtype) {
case MACH_DS23100: /* DS2100/DS3100 Pmin/Pmax */
{
switch (mips_machtype) {
case MACH_DS23100: /* DS2100/DS3100 Pmin/Pmax */