From c03c4d59f221bc8da07c4509e1756f6344d04d1a Mon Sep 17 00:00:00 2001
From: Holger Schurig <h.schurig@mn-solutions.de>
Date: Mon, 11 Feb 2008 16:51:41 +0100
Subject: [PATCH] --- yaml --- r: 86047 b: refs/heads/master c:
 d6a7b5f84b5c15617010e06c95129fe8800e6b21 h: refs/heads/master i:   86045:
 9668e99bd83f0632e3aba567e72f7c24e9cdd6d8   86043:
 71294d4e6d83a0ec74f82e989fc6f7e6fda7fab9   86039:
 aacb5c74f56e1e9938155f9b727054319669a5cb   86031:
 8cf6bfd7036fa5a31f24b7951e6489225810acea   86015:
 ba75859c7e4a96454c07ff7a064f086eac591220 v: v3

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

diff --git a/[refs] b/[refs]
index de1556a3e1ea..2a39dae99dac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59e8ce574445c5e7a65ec36f47a54803de704e96
+refs/heads/master: d6a7b5f84b5c15617010e06c95129fe8800e6b21
diff --git a/trunk/drivers/i2c/busses/i2c-pxa.c b/trunk/drivers/i2c/busses/i2c-pxa.c
index 2598d29fd7a4..2b557bfd7f70 100644
--- a/trunk/drivers/i2c/busses/i2c-pxa.c
+++ b/trunk/drivers/i2c/busses/i2c-pxa.c
@@ -138,11 +138,13 @@ static const struct bits icr_bits[] = {
 	PXA_BIT(ICR_UR,     "UR",		"ur"),
 };
 
+#ifdef CONFIG_I2C_PXA_SLAVE
 static void decode_ICR(unsigned int val)
 {
 	decode_bits(KERN_DEBUG "ICR", icr_bits, ARRAY_SIZE(icr_bits), val);
 	printk("\n");
 }
+#endif
 
 static unsigned int i2c_debug = DEBUG;
 
@@ -1122,7 +1124,7 @@ static int __init i2c_adap_pxa_init(void)
 
 static void i2c_adap_pxa_exit(void)
 {
-	return platform_driver_unregister(&i2c_pxa_driver);
+	platform_driver_unregister(&i2c_pxa_driver);
 }
 
 MODULE_LICENSE("GPL");