From 0e1745adf28afed95dfe1ff2013a2470f78b24ad Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Fri, 7 May 2010 10:01:28 +0900 Subject: [PATCH] --- yaml --- r: 191991 b: refs/heads/master c: 0c3767b161a91eab5b23d602d374b9c070c067a9 h: refs/heads/master i: 191989: 7d45686c50c1b89551d54cf47287349a9c5c76a6 191987: fa046338b9c5fe8439833feb9a2f17b854b39e2c 191983: 2c0e54e2154792cbfd61708eba0f05578812ec7b v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c2410/mach-n30.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index d3c733682e78..f02df8a17995 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a19ebb0938752af8da142c4731f310bb8f9d130 +refs/heads/master: 0c3767b161a91eab5b23d602d374b9c070c067a9 diff --git a/trunk/arch/arm/mach-s3c2410/mach-n30.c b/trunk/arch/arm/mach-s3c2410/mach-n30.c index dfa09eac160c..9e2565ad973d 100644 --- a/trunk/arch/arm/mach-s3c2410/mach-n30.c +++ b/trunk/arch/arm/mach-s3c2410/mach-n30.c @@ -552,11 +552,6 @@ static void __init n30_map_io(void) s3c24xx_init_uarts(n30_uartcfgs, ARRAY_SIZE(n30_uartcfgs)); } -static void __init n30_init_irq(void) -{ - s3c24xx_init_irq(); -} - /* GPB3 is the line that controls the pull-up for the USB D+ line */ static void __init n30_init(void) @@ -612,7 +607,7 @@ MACHINE_START(N30, "Acer-N30") .boot_params = S3C2410_SDRAM_PA + 0x100, .timer = &s3c24xx_timer, .init_machine = n30_init, - .init_irq = n30_init_irq, + .init_irq = s3c24xx_init_irq, .map_io = n30_map_io, MACHINE_END @@ -624,6 +619,6 @@ MACHINE_START(N35, "Acer-N35") .boot_params = S3C2410_SDRAM_PA + 0x100, .timer = &s3c24xx_timer, .init_machine = n30_init, - .init_irq = n30_init_irq, + .init_irq = s3c24xx_init_irq, .map_io = n30_map_io, MACHINE_END