From ac9931b62adcd2737c283c12b0a0f011e7b557f7 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Thu, 14 Mar 2013 15:49:46 +0530
Subject: [PATCH] --- yaml --- r: 367503 b: refs/heads/master c:
 075ed03ce6c2cd148b4606619e775c6e46aa89e1 h: refs/heads/master i:   367501:
 9e6510da5c5ad77b1e6cb5b091b37e4ddee2d165   367499:
 8aa259b7db392d7785fc2236fae6947fa47d7e23   367495:
 a56290212c7ea01d865ed2152d4920179c8f4b11   367487:
 9186cc366b038bebb4c1507284f5356067ffb44c v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/power/sbs-battery.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b911e4128b9f..50ca4d12bcde 100644
--- 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
index 3960f0b2afe9..3922f06120c8 100644
--- 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);