From 93385ec1f27a215001ff1fc328045f26e265815a Mon Sep 17 00:00:00 2001 From: merge Date: Sun, 14 Dec 2008 10:41:11 +0000 Subject: MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-MERGE-via-mokopatches-tracking-MERGE-via-master-hist-1229249926-1229250322-1229250598 pending-tracking-hist top was MERGE-via-stable-tracking-MERGE-via-mokopatches-tracking-MERGE-via-master-hist-1229249926-1229250322-1229250598 / 1231dc713a5825b92b6809aa417686c579e6a9f9 ... parent commitmessage: From: merge MERGE-via-stable-tracking-hist-MERGE-via-mokopatches-tracking-MERGE-via-master-hist-1229249926-1229250322 stable-tracking-hist top was MERGE-via-mokopatches-tracking-MERGE-via-master-hist-1229249926-1229250322 / 9c01cf722f0536f4827d76d36ee58c070b21c0da ... parent commitmessage: From: merge MERGE-via-mokopatches-tracking-hist-MERGE-via-master-hist-1229249926 mokopatches-tracking-hist top was MERGE-via-master-hist-1229249926 / 8f700d425b380707d4f2b7052c1b1f7e77c8b7d3 ... parent commitmessage: From: merge MERGE-mokopatches-tracking-patchset-edits --- arch/arm/plat-s3c64xx/irq.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'arch/arm/plat-s3c64xx/irq.c') diff --git a/arch/arm/plat-s3c64xx/irq.c b/arch/arm/plat-s3c64xx/irq.c index 12e9d689b15..79166767fd3 100644 --- a/arch/arm/plat-s3c64xx/irq.c +++ b/arch/arm/plat-s3c64xx/irq.c @@ -251,8 +251,6 @@ void __init s3c64xx_init_irq(u32 vic0_valid, u32 vic1_valid) for (uart = 0; uart < ARRAY_SIZE(uart_irqs); uart++) s3c64xx_uart_irq(&uart_irqs[uart]); - } - -- cgit v1.2.3