From 112595ca3144e7dfc2c60763d258cf4aa5c57dd5 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Tue, 8 May 2007 00:36:44 -0700
Subject: [PATCH] --- yaml --- r: 54855 b: refs/heads/master c:
 31b4f0a118a7ade8444059ec898af8f07de206e9 h: refs/heads/master i:   54853:
 0a31479174fb635a7f32b17b433012c08ee794de   54851:
 ec9affe4dd3f1df2015984b9dc21574911391fb1   54847:
 b6d36de3b0bd76c8e335934a62c8092eeec183e5 v: v3

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

diff --git a/[refs] b/[refs]
index 9ef230dfe589..b49c48db6430 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 217191910c0286e0b3c7e3011630273695253da3
+refs/heads/master: 31b4f0a118a7ade8444059ec898af8f07de206e9
diff --git a/trunk/drivers/char/cyclades.c b/trunk/drivers/char/cyclades.c
index 7a1530012227..738903d707f7 100644
--- a/trunk/drivers/char/cyclades.c
+++ b/trunk/drivers/char/cyclades.c
@@ -4651,8 +4651,8 @@ static void __devinit cy_init_card(struct cyclades_card *cinfo,
 
 /* initialize chips on Cyclom-Y card -- return number of valid
    chips (which is number of ports/4) */
-static unsigned short __init
-cyy_init_card(void __iomem * true_base_addr, int index)
+static unsigned short __devinit cyy_init_card(void __iomem *true_base_addr,
+		int index)
 {
 	unsigned int chip_number;
 	void __iomem *base_addr;