From e25d44918c61022ccdccfd1683b5067e6866806f Mon Sep 17 00:00:00 2001
From: Henrik Kretzschmar <henne@nachtwindheim.de>
Date: Fri, 26 Mar 2010 02:40:13 +0100
Subject: [PATCH] --- yaml --- r: 199380 b: refs/heads/master c:
 872c1b14e78661086ade8b501888850da2636eee h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/mfd/88pm860x-core.c  | 6 +++---
 trunk/include/linux/mfd/88pm860x.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index d04e65b4cdc1..30dc081888f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f03cfcbc843ae6854c69dbc771762b83b3bea15f
+refs/heads/master: 872c1b14e78661086ade8b501888850da2636eee
diff --git a/trunk/drivers/mfd/88pm860x-core.c b/trunk/drivers/mfd/88pm860x-core.c
index 405d2d5183cf..2c65a2c57294 100644
--- a/trunk/drivers/mfd/88pm860x-core.c
+++ b/trunk/drivers/mfd/88pm860x-core.c
@@ -566,7 +566,7 @@ static int __devinit device_irq_init(struct pm860x_chip *chip,
 	return ret;
 }
 
-static void __devexit device_irq_exit(struct pm860x_chip *chip)
+static void device_irq_exit(struct pm860x_chip *chip)
 {
 	if (chip->core_irq)
 		free_irq(chip->core_irq, chip);
@@ -703,7 +703,7 @@ static void __devinit device_8607_init(struct pm860x_chip *chip,
 	return;
 }
 
-int pm860x_device_init(struct pm860x_chip *chip,
+int __devinit pm860x_device_init(struct pm860x_chip *chip,
 		       struct pm860x_platform_data *pdata)
 {
 	chip->core_irq = 0;
@@ -731,7 +731,7 @@ int pm860x_device_init(struct pm860x_chip *chip,
 	return 0;
 }
 
-void pm860x_device_exit(struct pm860x_chip *chip)
+void __devexit pm860x_device_exit(struct pm860x_chip *chip)
 {
 	device_irq_exit(chip);
 	mfd_remove_devices(chip->dev);
diff --git a/trunk/include/linux/mfd/88pm860x.h b/trunk/include/linux/mfd/88pm860x.h
index e3c4ff8c3e38..bfd23bef7363 100644
--- a/trunk/include/linux/mfd/88pm860x.h
+++ b/trunk/include/linux/mfd/88pm860x.h
@@ -370,7 +370,7 @@ extern int pm860x_set_bits(struct i2c_client *, int, unsigned char,
 			   unsigned char);
 
 extern int pm860x_device_init(struct pm860x_chip *chip,
-			      struct pm860x_platform_data *pdata);
-extern void pm860x_device_exit(struct pm860x_chip *chip);
+			      struct pm860x_platform_data *pdata) __devinit ;
+extern void pm860x_device_exit(struct pm860x_chip *chip) __devexit ;
 
 #endif /* __LINUX_MFD_88PM860X_H */