diff options
Diffstat (limited to 'arch/arm/mach-sa1100/pleb.c')
| -rw-r--r-- | arch/arm/mach-sa1100/pleb.c | 25 | 
1 files changed, 5 insertions, 20 deletions
diff --git a/arch/arm/mach-sa1100/pleb.c b/arch/arm/mach-sa1100/pleb.c index 9307df05353..1602575a0d5 100644 --- a/arch/arm/mach-sa1100/pleb.c +++ b/arch/arm/mach-sa1100/pleb.c @@ -37,17 +37,9 @@  #define IRQ_GPIO_ETH0_IRQ	IRQ_GPIO21  static struct resource smc91x_resources[] = { -	[0] = { -		.start	= PLEB_ETH0_P, -		.end	= PLEB_ETH0_P | 0x03ffffff, -		.flags	= IORESOURCE_MEM, -	}, +	[0] = DEFINE_RES_MEM(PLEB_ETH0_P, 0x04000000),  #if 0 /* Autoprobe instead, to get rising/falling edge characteristic right */ -	[1] = { -		.start	= IRQ_GPIO_ETH0_IRQ, -		.end	= IRQ_GPIO_ETH0_IRQ, -		.flags	= IORESOURCE_IRQ, -	}, +	[1] = DEFINE_RES_IRQ(IRQ_GPIO_ETH0_IRQ),  #endif  }; @@ -70,16 +62,8 @@ static struct platform_device *devices[] __initdata = {   * the two SA1100 lowest chip select outputs.   */  static struct resource pleb_flash_resources[] = { -	[0] = { -		.start = SA1100_CS0_PHYS, -		.end   = SA1100_CS0_PHYS + SZ_8M - 1, -		.flags = IORESOURCE_MEM, -	}, -	[1] = { -		.start = SA1100_CS1_PHYS, -		.end   = SA1100_CS1_PHYS + SZ_8M - 1, -		.flags = IORESOURCE_MEM, -	} +	[0] = DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_8M), +	[1] = DEFINE_RES_MEM(SA1100_CS1_PHYS, SZ_8M),  }; @@ -147,6 +131,7 @@ static void __init pleb_map_io(void)  MACHINE_START(PLEB, "PLEB")  	.map_io		= pleb_map_io, +	.nr_irqs	= SA1100_NR_IRQS,  	.init_irq	= sa1100_init_irq,  	.timer		= &sa1100_timer,  	.init_machine   = pleb_init,  |