diff options
author | Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2013-08-12 13:14:46 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-09-17 12:08:14 -0400 |
commit | ab5be58833455dd2f942b9e2e5fcc8d9b4c7c9e6 (patch) | |
tree | 9dbf5c55283393ebceacd68d2ad0b79466fd0075 | |
parent | a0396b9bd5a4a7baf598b60d2ca53c605c440a42 (diff) |
mtd: nand: pxa3xx: Remove unneeded ifdef CONFIG_OF
There's no need to enclose this code within idef CONFIG_OF,
because the OF framework provides no-op stubs if CONFIG_OF=n.
Cc: devicetree@vger.kernel.org
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | drivers/mtd/nand/pxa3xx_nand.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 5db900d917f9..dd03dfdfb0d6 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c | |||
@@ -1236,7 +1236,6 @@ static int pxa3xx_nand_remove(struct platform_device *pdev) | |||
1236 | return 0; | 1236 | return 0; |
1237 | } | 1237 | } |
1238 | 1238 | ||
1239 | #ifdef CONFIG_OF | ||
1240 | static struct of_device_id pxa3xx_nand_dt_ids[] = { | 1239 | static struct of_device_id pxa3xx_nand_dt_ids[] = { |
1241 | { | 1240 | { |
1242 | .compatible = "marvell,pxa3xx-nand", | 1241 | .compatible = "marvell,pxa3xx-nand", |
@@ -1284,12 +1283,6 @@ static int pxa3xx_nand_probe_dt(struct platform_device *pdev) | |||
1284 | 1283 | ||
1285 | return 0; | 1284 | return 0; |
1286 | } | 1285 | } |
1287 | #else | ||
1288 | static inline int pxa3xx_nand_probe_dt(struct platform_device *pdev) | ||
1289 | { | ||
1290 | return 0; | ||
1291 | } | ||
1292 | #endif | ||
1293 | 1286 | ||
1294 | static int pxa3xx_nand_probe(struct platform_device *pdev) | 1287 | static int pxa3xx_nand_probe(struct platform_device *pdev) |
1295 | { | 1288 | { |