diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 08:57:19 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 08:58:00 -0500 |
commit | 11128b90212d70019fd84dd514ea25f4552159f1 (patch) | |
tree | 460cdbb987f0bf247a15bae9be4f7255eb103f50 /drivers/memory | |
parent | d09a0011ec0d511b51d6378a071fd8d75eb27622 (diff) | |
parent | d0c7546f6257b4680a760e3fd0dff8a7cc4600ff (diff) |
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.c | 4 |
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 @@ | |||
14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
15 | #include <linux/of.h> | 15 | #include <linux/of.h> |
16 | #include <linux/of_device.h> | 16 | #include <linux/of_device.h> |
17 | #include <linux/of_fdt.h> | ||
18 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
19 | #include <linux/io.h> | 18 | #include <linux/io.h> |
20 | 19 | ||
@@ -117,8 +116,7 @@ static int da8xx_ddrctl_probe(struct platform_device *pdev) | |||
117 | 116 | ||
118 | setting = da8xx_ddrctl_get_board_settings(); | 117 | setting = da8xx_ddrctl_get_board_settings(); |
119 | if (!setting) { | 118 | if (!setting) { |
120 | dev_err(dev, "no settings for board '%s'\n", | 119 | dev_err(dev, "no settings defined for this board\n"); |
121 | of_flat_dt_get_machine_name()); | ||
122 | return -EINVAL; | 120 | return -EINVAL; |
123 | } | 121 | } |
124 | 122 | ||