From c675aee017d59a8fdfa4ec088f04ea107f9b4829 Mon Sep 17 00:00:00 2001
From: Benoit Goby <benoit@android.com>
Date: Thu, 10 May 2012 10:08:01 +0200
Subject: [PATCH] --- yaml --- r: 303887 b: refs/heads/master c:
 c3c04b2945eccd8cdc07bbede3090c18dfed43c0 h: refs/heads/master i:   303885:
 17b951fbff940d3a4f33484735008cb6ccb1f87f   303883:
 f0f3dbe674dd04de2cf172b0c4298bb8385a3964   303879:
 e019ea2916626e9f5ed07632ac5e16a2cf432602   303871:
 b70ed04012198cddc7d8eda33b99570c9215a21f v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/usb/gadget/u_serial.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 21a55b02ff02..51d0baff3741 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cad4cd8fbde6b2f45b51711260343b3195615c79
+refs/heads/master: c3c04b2945eccd8cdc07bbede3090c18dfed43c0
diff --git a/trunk/drivers/usb/gadget/u_serial.c b/trunk/drivers/usb/gadget/u_serial.c
index 6c23938d2711..380a87f6e56c 100644
--- a/trunk/drivers/usb/gadget/u_serial.c
+++ b/trunk/drivers/usb/gadget/u_serial.c
@@ -1025,7 +1025,7 @@ static const struct tty_operations gs_tty_ops = {
 
 static struct tty_driver *gs_tty_driver;
 
-static int __init
+static int
 gs_port_alloc(unsigned port_num, struct usb_cdc_line_coding *coding)
 {
 	struct gs_port	*port;
@@ -1071,7 +1071,7 @@ gs_port_alloc(unsigned port_num, struct usb_cdc_line_coding *coding)
  *
  * Returns negative errno or zero.
  */
-int __init gserial_setup(struct usb_gadget *g, unsigned count)
+int gserial_setup(struct usb_gadget *g, unsigned count)
 {
 	unsigned			i;
 	struct usb_cdc_line_coding	coding;