---

yaml --- r: 86047 b: refs/heads/master c: d6a7b5f h: refs/heads/master i: 86045: 9668e99 86043: 71294d4 86039: aacb5c7 86031: 8cf6bfd 86015: ba75859 v: v3
git-mirror · Feb 17, 2008 · c03c4d5 · c03c4d5
1 parent 873049f
commit c03c4d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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");