diff options
Diffstat (limited to 'arch/arm/mach-u300/core.c')
| -rw-r--r-- | arch/arm/mach-u300/core.c | 7 | 
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index b8efac4daed..12f3994c43d 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -82,8 +82,6 @@ static struct map_desc u300_io_desc[] __initdata = {  static void __init u300_map_io(void)  {  	iotable_init(u300_io_desc, ARRAY_SIZE(u300_io_desc)); -	/* We enable a real big DMA buffer if need be. */ -	init_consistent_dma_size(SZ_4M);  }  /* @@ -1445,8 +1443,6 @@ static struct platform_device pinctrl_device = {  static struct u300_gpio_platform u300_gpio_plat = {  	.ports = 7,  	.gpio_base = 0, -	.gpio_irq_base = IRQ_U300_GPIO_BASE, -	.pinctrl_device = &pinctrl_device,  };  static struct platform_device gpio_device = { @@ -1590,6 +1586,7 @@ static struct platform_device *platform_devs[] __initdata = {  	&i2c1_device,  	&keypad_device,  	&rtc_device, +	&pinctrl_device,  	&gpio_device,  	&nand_device,  	&wdog_device, @@ -1804,7 +1801,7 @@ MACHINE_START(U300, "Ericsson AB U335 S335/B335 Prototype Board")  	/* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */  	.atag_offset	= 0x100,  	.map_io		= u300_map_io, -	.nr_irqs	= NR_IRQS_U300, +	.nr_irqs	= 0,  	.init_irq	= u300_init_irq,  	.handle_irq	= vic_handle_irq,  	.timer		= &u300_timer,  |