Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b56a937 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

bast-ide: build fix 



On Saturday 09 February 2008, Adrian Bunk wrote:
> Commit 9e016a71 causes the following 
> compile error:
> 
> <--  snip  -->
> 
> ...
>   CC      drivers/ide/arm/bast-ide.o
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c: In function 'bastide_register':
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:31: error: 'hwif' redeclared as different kind of symbol
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:29: error: previous definition of 'hwif' was here
> make[4]: *** [drivers/ide/arm/bast-ide.o] Error 1
> 
> <--  snip  -->

Remove 'ide_hwif_t **hwif' argument from bastide_register()
(together with write-only ifs[]).

Cc: Adrian Bunk <bunk@kernel.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 31cb2120

drivers/ide/arm/bast-ide.c

+4 −8
Original line number Diff line number Diff line
@@ -21,12 +21,7 @@ 
#include <asm/arch/bast-map.h>

#include <asm/arch/bast-irq.h>



/* list of registered interfaces */

static ide_hwif_t *ifs[2];



static int __init

bastide_register(unsigned int base, unsigned int aux, int irq,

		 ide_hwif_t **hwif)

static int __init bastide_register(unsigned int base, unsigned int aux, int irq)

{

	ide_hwif_t *hwif;

	hw_regs_t hw;
@@ -76,8 +71,9 @@ static int __init bastide_init(void) 


	printk("BAST: IDE driver, (c) 2003-2004 Simtec Electronics\n");



	bastide_register(BAST_VA_IDEPRI, BAST_VA_IDEPRIAUX, IRQ_IDE0, &ifs[0]);

	bastide_register(BAST_VA_IDESEC, BAST_VA_IDESECAUX, IRQ_IDE1, &ifs[1]);

	bastide_register(BAST_VA_IDEPRI, BAST_VA_IDEPRIAUX, IRQ_IDE0);

	bastide_register(BAST_VA_IDESEC, BAST_VA_IDESECAUX, IRQ_IDE1);



	return 0;

}