From c3ca925e7e8f44fbd2cca1cef8f979cf811877d7 Mon Sep 17 00:00:00 2001 From: Pete Popov Date: Fri, 4 Mar 2005 08:31:06 +0000 Subject: [PATCH] --- yaml --- r: 11035 b: refs/heads/master c: ebc7f12fbc6a2d2df1930b91b380c9defb48cbf3 h: refs/heads/master i: 11033: 75c6e6516038d3acb411ee047fdbe7a421e1a4d4 11031: fabf70585bcdd59cb140db204e8c1de3509aecca v: v3 --- [refs] | 2 +- trunk/arch/mips/au1000/pb1200/board_setup.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bb74b24e5eb3..d55181718b22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88d535b6b58632bc51ee9a1f35ddfc357e365c37 +refs/heads/master: ebc7f12fbc6a2d2df1930b91b380c9defb48cbf3 diff --git a/trunk/arch/mips/au1000/pb1200/board_setup.c b/trunk/arch/mips/au1000/pb1200/board_setup.c index 209a07cb7321..9c5d48dd7121 100644 --- a/trunk/arch/mips/au1000/pb1200/board_setup.c +++ b/trunk/arch/mips/au1000/pb1200/board_setup.c @@ -59,8 +59,6 @@ extern void _board_init_irq(void); extern void (*board_init_irq)(void); #ifdef CONFIG_BLK_DEV_IDE_AU1XXX -extern struct ide_ops *ide_ops; -extern struct ide_ops au1xxx_ide_ops; extern u32 au1xxx_ide_virtbase; extern u64 au1xxx_ide_physbase; extern int au1xxx_ide_irq; @@ -147,7 +145,6 @@ void __init board_setup(void) /* * Iniz IDE parameters */ - ide_ops = &au1xxx_ide_ops; au1xxx_ide_irq = PB1200_IDE_INT; au1xxx_ide_physbase = AU1XXX_ATA_PHYS_ADDR; au1xxx_ide_virtbase = KSEG1ADDR(AU1XXX_ATA_PHYS_ADDR); @@ -176,12 +173,11 @@ void __init board_setup(void) #ifdef CONFIG_MIPS_DB1200 printk("AMD Alchemy Db1200 Board\n"); #endif -#if 0 + /* Setup Pb1200 External Interrupt Controller */ { extern void (*board_init_irq)(void); extern void _board_init_irq(void); board_init_irq = _board_init_irq; } -#endif }