From f9d3c1d2202bafbdf8f147c7340f14bb0cc17185 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Thu, 14 Mar 2013 00:13:03 +0000
Subject: [PATCH] --- yaml --- r: 370993 b: refs/heads/master c:
 600abeadf318fbdb25e1e3e4379f6a7bb1952d5b h: refs/heads/master i:   370991:
 1f5a9fdddc167b0c12f45f86cca716dc90e8ad53 v: v3

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

diff --git a/[refs] b/[refs]
index 5a6836cdff4c..2d4c465c3c43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 857968434bb6dbda0911f38ec46b0c3d0c963771
+refs/heads/master: 600abeadf318fbdb25e1e3e4379f6a7bb1952d5b
diff --git a/trunk/drivers/i2c/busses/i2c-at91.c b/trunk/drivers/i2c/busses/i2c-at91.c
index 75195e3f5ddb..23a1c44be340 100644
--- a/trunk/drivers/i2c/busses/i2c-at91.c
+++ b/trunk/drivers/i2c/busses/i2c-at91.c
@@ -603,8 +603,6 @@ static const struct of_device_id atmel_twi_dt_ids[] = {
 	}
 };
 MODULE_DEVICE_TABLE(of, atmel_twi_dt_ids);
-#else
-#define atmel_twi_dt_ids NULL
 #endif
 
 static bool filter(struct dma_chan *chan, void *slave)
@@ -828,7 +826,7 @@ static struct platform_driver at91_twi_driver = {
 	.driver		= {
 		.name	= "at91_i2c",
 		.owner	= THIS_MODULE,
-		.of_match_table = atmel_twi_dt_ids,
+		.of_match_table = of_match_ptr(atmel_twi_dt_ids),
 		.pm	= at91_twi_pm_ops,
 	},
 };