From 1c64f816aa6241649543ea1579d30a76129d1c10 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Sun, 27 May 2012 02:42:12 +0000
Subject: [PATCH] --- yaml --- r: 333292 b: refs/heads/master c:
 673550a19f01c7955a1321ed9f43a4e2fd9cabf6 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/mach-s3c24xx/irq-s3c2416.c | 6 +++---
 trunk/arch/arm/mach-s3c24xx/irq-s3c2443.c | 4 ++--
 trunk/arch/arm/mach-s3c24xx/simtec-usb.c  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index c3e1f43b805a..1e6915e0e7d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e0e4e11623e57c0f6635f5dc6972244ce511f77
+refs/heads/master: 673550a19f01c7955a1321ed9f43a4e2fd9cabf6
diff --git a/trunk/arch/arm/mach-s3c24xx/irq-s3c2416.c b/trunk/arch/arm/mach-s3c24xx/irq-s3c2416.c
index 23ec97370f32..ff141b0af26b 100644
--- a/trunk/arch/arm/mach-s3c24xx/irq-s3c2416.c
+++ b/trunk/arch/arm/mach-s3c24xx/irq-s3c2416.c
@@ -232,7 +232,7 @@ struct irq_chip s3c2416_irq_second = {
 
 /* IRQ initialisation code */
 
-static int __init s3c2416_add_sub(unsigned int base,
+static int s3c2416_add_sub(unsigned int base,
 				   void (*demux)(unsigned int,
 						 struct irq_desc *),
 				   struct irq_chip *chip,
@@ -251,7 +251,7 @@ static int __init s3c2416_add_sub(unsigned int base,
 	return 0;
 }
 
-static void __init s3c2416_irq_add_second(void)
+static void s3c2416_irq_add_second(void)
 {
 	unsigned long pend;
 	unsigned long last;
@@ -287,7 +287,7 @@ static void __init s3c2416_irq_add_second(void)
 	}
 }
 
-static int __init s3c2416_irq_add(struct device *dev,
+static int s3c2416_irq_add(struct device *dev,
 				  struct subsys_interface *sif)
 {
 	printk(KERN_INFO "S3C2416: IRQ Support\n");
diff --git a/trunk/arch/arm/mach-s3c24xx/irq-s3c2443.c b/trunk/arch/arm/mach-s3c24xx/irq-s3c2443.c
index ac2829f56d12..5e69109c0928 100644
--- a/trunk/arch/arm/mach-s3c24xx/irq-s3c2443.c
+++ b/trunk/arch/arm/mach-s3c24xx/irq-s3c2443.c
@@ -222,7 +222,7 @@ static struct irq_chip s3c2443_irq_cam = {
 
 /* IRQ initialisation code */
 
-static int __init s3c2443_add_sub(unsigned int base,
+static int s3c2443_add_sub(unsigned int base,
 				   void (*demux)(unsigned int,
 						 struct irq_desc *),
 				   struct irq_chip *chip,
@@ -241,7 +241,7 @@ static int __init s3c2443_add_sub(unsigned int base,
 	return 0;
 }
 
-static int __init s3c2443_irq_add(struct device *dev,
+static int s3c2443_irq_add(struct device *dev,
 				  struct subsys_interface *sif)
 {
 	printk("S3C2443: IRQ Support\n");
diff --git a/trunk/arch/arm/mach-s3c24xx/simtec-usb.c b/trunk/arch/arm/mach-s3c24xx/simtec-usb.c
index d91c1a725139..c303d1b63a86 100644
--- a/trunk/arch/arm/mach-s3c24xx/simtec-usb.c
+++ b/trunk/arch/arm/mach-s3c24xx/simtec-usb.c
@@ -104,7 +104,7 @@ static struct s3c2410_hcd_info usb_simtec_info __initdata = {
 };
 
 
-int usb_simtec_init(void)
+int __init usb_simtec_init(void)
 {
 	int ret;