From b5d90ab9439c4acaa3416e74040ab6560f2243c7 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Wed, 29 Jun 2005 11:09:15 +0100 Subject: [PATCH] --- yaml --- r: 3939 b: refs/heads/master c: 6904b2465cf30265a67711025815784aa345bfad h: refs/heads/master i: 3937: b38fef19f22e4be880b410db5a23c5a266c11653 3935: 756e1e6049c3fb26332ce58c588aa70b3a816a74 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c2410/devs.c | 4 ++-- trunk/arch/arm/mach-s3c2410/mach-vr1000.c | 8 ++------ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 804b895dd6a1..5288cccc731e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f705b1aed7002495a504086705ff9725ed9412dc +refs/heads/master: 6904b2465cf30265a67711025815784aa345bfad diff --git a/trunk/arch/arm/mach-s3c2410/devs.c b/trunk/arch/arm/mach-s3c2410/devs.c index 64792f678668..4664bd11adc1 100644 --- a/trunk/arch/arm/mach-s3c2410/devs.c +++ b/trunk/arch/arm/mach-s3c2410/devs.c @@ -96,8 +96,8 @@ struct platform_device s3c_device_lcd = { .num_resources = ARRAY_SIZE(s3c_lcd_resource), .resource = s3c_lcd_resource, .dev = { - .dma_mask = &s3c_device_lcd_dmamask, - .coherent_dma_mask = 0xffffffffUL + .dma_mask = &s3c_device_lcd_dmamask, + .coherent_dma_mask = 0xffffffffUL } }; diff --git a/trunk/arch/arm/mach-s3c2410/mach-vr1000.c b/trunk/arch/arm/mach-s3c2410/mach-vr1000.c index 76be074944a0..1db2855e3e56 100644 --- a/trunk/arch/arm/mach-s3c2410/mach-vr1000.c +++ b/trunk/arch/arm/mach-s3c2410/mach-vr1000.c @@ -371,16 +371,12 @@ void __init vr1000_map_io(void) usb_simtec_init(); } -void __init vr1000_init_irq(void) -{ - s3c24xx_init_irq(); -} MACHINE_START(VR1000, "Thorcom-VR1000") MAINTAINER("Ben Dooks ") BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART) BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100) - MAPIO(vr1000_map_io) - INITIRQ(vr1000_init_irq) + .map_io = vr1000_map_io, + .init_irq = s3c24xx_init_irq, .timer = &s3c24xx_timer, MACHINE_END