From cc0a71579a4ef9e3a665f5c20a76d29672bc8531 Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Thu, 14 Mar 2013 15:37:00 +0530 Subject: [PATCH] --- yaml --- r: 374773 b: refs/heads/master c: 19d69b86007e6ede34c08f0b5635d1aaba6a46b7 h: refs/heads/master i: 374771: 51154a6cb597d356c5704deaba3ce1044059fe26 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/devices/mtd_dataflash.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 126d2348abf2..ddb365421b90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcf8abfcb0816adfb9bb175cbea00d7a1a2cae69 +refs/heads/master: 19d69b86007e6ede34c08f0b5635d1aaba6a46b7 diff --git a/trunk/drivers/mtd/devices/mtd_dataflash.c b/trunk/drivers/mtd/devices/mtd_dataflash.c index 945c9f762349..28779b6dfcd9 100644 --- a/trunk/drivers/mtd/devices/mtd_dataflash.c +++ b/trunk/drivers/mtd/devices/mtd_dataflash.c @@ -105,8 +105,6 @@ static const struct of_device_id dataflash_dt_ids[] = { { .compatible = "atmel,dataflash", }, { /* sentinel */ } }; -#else -#define dataflash_dt_ids NULL #endif /* ......................................................................... */ @@ -914,7 +912,7 @@ static struct spi_driver dataflash_driver = { .driver = { .name = "mtd_dataflash", .owner = THIS_MODULE, - .of_match_table = dataflash_dt_ids, + .of_match_table = of_match_ptr(dataflash_dt_ids), }, .probe = dataflash_probe,