summaryrefslogtreecommitdiffstats
path: root/drivers/memory
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-11-30 14:57:19 +0100
committerArnd Bergmann <arnd@arndb.de>2016-11-30 14:58:00 +0100
commit11128b90212d70019fd84dd514ea25f4552159f1 (patch)
tree460cdbb987f0bf247a15bae9be4f7255eb103f50 /drivers/memory
parentd09a0011ec0d511b51d6378a071fd8d75eb27622 (diff)
parentd0c7546f6257b4680a760e3fd0dff8a7cc4600ff (diff)
downloadlinux-11128b90212d70019fd84dd514ea25f4552159f1.tar.bz2
Merge tag 'davinci-for-v4.10/drivers-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/drivers
Pull "DaVinci driver updates for v4.10 (part 2)" from Sekhar Nori: Fixes for drivers already queued to prevent section mismatch warnings introduced by them. * tag 'davinci-for-v4.10/drivers-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: memory: da8xx-ddrctl: drop the call to of_flat_dt_get_machine_name() bus: da8xx-mstpri: drop the call to of_flat_dt_get_machine_name()
Diffstat (limited to 'drivers/memory')
-rw-r--r--drivers/memory/da8xx-ddrctl.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/memory/da8xx-ddrctl.c b/drivers/memory/da8xx-ddrctl.c
index a20e7bbbcbe0..030afbe29d0c 100644
--- a/drivers/memory/da8xx-ddrctl.c
+++ b/drivers/memory/da8xx-ddrctl.c
@@ -14,7 +14,6 @@
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_device.h>
-#include <linux/of_fdt.h>
#include <linux/platform_device.h>
#include <linux/io.h>
@@ -117,8 +116,7 @@ static int da8xx_ddrctl_probe(struct platform_device *pdev)
setting = da8xx_ddrctl_get_board_settings();
if (!setting) {
- dev_err(dev, "no settings for board '%s'\n",
- of_flat_dt_get_machine_name());
+ dev_err(dev, "no settings defined for this board\n");
return -EINVAL;
}