From 0c87adbf18afed0420da2bcc14adb27be31cd74c Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 25 Apr 2013 16:49:05 +0200
Subject: [PATCH] --- yaml --- r: 372510 b: refs/heads/master c:
 bc8fd900c4d460b4e4bf785bb48bfced0ac9941b h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/irqchip/irq-s3c24xx.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9f20e205a670..7c2f23225fac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 522ccdb6fd0e9689fbdc005ce95a42d70ec81629
+refs/heads/master: bc8fd900c4d460b4e4bf785bb48bfced0ac9941b
diff --git a/trunk/drivers/irqchip/irq-s3c24xx.c b/trunk/drivers/irqchip/irq-s3c24xx.c
index 5e40b3424df8..f750f551fc70 100644
--- a/trunk/drivers/irqchip/irq-s3c24xx.c
+++ b/trunk/drivers/irqchip/irq-s3c24xx.c
@@ -534,7 +534,7 @@ static void s3c24xx_clear_intc(struct s3c_irq_intc *intc)
 	}
 }
 
-static struct s3c_irq_intc *s3c24xx_init_intc(struct device_node *np,
+static struct s3c_irq_intc * __init s3c24xx_init_intc(struct device_node *np,
 				       struct s3c_irq_data *irq_data,
 				       struct s3c_irq_intc *parent,
 				       unsigned long address)
@@ -794,7 +794,7 @@ static struct s3c_irq_data init_s3c2412subint[32] = {
 	{ .type = S3C_IRQTYPE_LEVEL, .parent_irq = 21 }, /* CF */
 };
 
-void s3c2412_init_irq(void)
+void __init s3c2412_init_irq(void)
 {
 	pr_info("S3C2412: IRQ Support\n");