---

yaml --- r: 367503 b: refs/heads/master c: 075ed03 h: refs/heads/master i: 367501: 9e6510d 367499: 8aa259b 367495: a562902 367487: 9186cc3 v: v3
git-mirror · Apr 1, 2013 · ac9931b · ac9931b
1 parent 939cc62
commit ac9931b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18bc4e79fdff1baa82d57ef364590fcdcc0a2612
+refs/heads/master: 075ed03ce6c2cd148b4606619e775c6e46aa89e1
diff --git a/trunk/drivers/power/sbs-battery.c b/trunk/drivers/power/sbs-battery.c
@@ -27,6 +27,7 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/gpio.h>
+#include <linux/of.h>
 
 #include <linux/power/sbs-battery.h>
 
@@ -667,7 +668,6 @@ static struct sbs_platform_data *sbs_of_populate_pdata(
 	return pdata;
 }
 #else
-#define sbs_dt_ids NULL
 static struct sbs_platform_data *sbs_of_populate_pdata(
 	struct i2c_client *client)
 {
@@ -859,7 +859,7 @@ static struct i2c_driver sbs_battery_driver = {
 	.id_table	= sbs_id,
 	.driver = {
 		.name	= "sbs-battery",
-		.of_match_table = sbs_dt_ids,
+		.of_match_table = of_match_ptr(sbs_dt_ids),
 	},
 };
 module_i2c_driver(sbs_battery_driver);