From 186ff6d78e5d62bcd852eae4108357d7052d5390 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Mon, 12 Jun 2006 21:46:04 +0200
Subject: [PATCH] --- yaml --- r: 28649 b: refs/heads/master c:
 9917392608c6d8b8952bce9f7b5867b1e9149235 h: refs/heads/master i:   28647:
 5fe87cdaecf59b1342419576b010b191278a8ed4 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/i2c/busses/scx200_acb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index aa907685e4f3..71da25f1ec23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80cd3a8769c66203d55cdf635390bdcebd742091
+refs/heads/master: 9917392608c6d8b8952bce9f7b5867b1e9149235
diff --git a/trunk/drivers/i2c/busses/scx200_acb.c b/trunk/drivers/i2c/busses/scx200_acb.c
index 09b4586f3bd3..22a3eda04166 100644
--- a/trunk/drivers/i2c/busses/scx200_acb.c
+++ b/trunk/drivers/i2c/busses/scx200_acb.c
@@ -384,7 +384,7 @@ static struct i2c_algorithm scx200_acb_algorithm = {
 static struct scx200_acb_iface *scx200_acb_list;
 static DECLARE_MUTEX(scx200_acb_list_mutex);
 
-static int scx200_acb_probe(struct scx200_acb_iface *iface)
+static __init int scx200_acb_probe(struct scx200_acb_iface *iface)
 {
 	u8 val;