From 3660f100e65ae2c4d50e359c573ff16b8da07a33 Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Thu, 14 Mar 2013 15:37:04 +0530 Subject: [PATCH] --- yaml --- r: 374777 b: refs/heads/master c: bd247acb77b7a3dcb1075d7c9f09bc46bd242f3b h: refs/heads/master i: 374775: 049285a901a00b9ade7f5e7932c39a786e7e2bba v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/sh_flctl.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7d30dc3db39f..0074357ca228 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b57d43ff64b036f43940e25d153518bee6cbc7ec +refs/heads/master: bd247acb77b7a3dcb1075d7c9f09bc46bd242f3b diff --git a/trunk/drivers/mtd/nand/sh_flctl.c b/trunk/drivers/mtd/nand/sh_flctl.c index 5899738ffced..e57e18e8c289 100644 --- a/trunk/drivers/mtd/nand/sh_flctl.c +++ b/trunk/drivers/mtd/nand/sh_flctl.c @@ -1081,7 +1081,6 @@ static struct sh_flctl_platform_data *flctl_parse_dt(struct device *dev) return pdata; } #else /* CONFIG_OF */ -#define of_flctl_match NULL static struct sh_flctl_platform_data *flctl_parse_dt(struct device *dev) { return NULL; @@ -1219,7 +1218,7 @@ static struct platform_driver flctl_driver = { .driver = { .name = "sh_flctl", .owner = THIS_MODULE, - .of_match_table = of_flctl_match, + .of_match_table = of_match_ptr(of_flctl_match), }, };