summaryrefslogtreecommitdiff
path: root/drivers/core/root.c
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2014-05-22 10:43:05 (GMT)
committerTom Rini <trini@ti.com>2014-05-27 14:21:32 (GMT)
commit54c5d08a09e631f88738db54c75395c6457c2157 (patch)
tree989241d18408f19062618bc380ef5948154f2334 /drivers/core/root.c
parent9665fa8f9e1488209d5e01d0792c243e0a220c5a (diff)
downloadu-boot-54c5d08a09e631f88738db54c75395c6457c2157.tar.xz
dm: rename device struct to udevice
using UBI and DM together leads in compiler error, as both define a "struct device", so rename "struct device" in include/dm/device.h to "struct udevice", as we use linux code (MTD/UBI/UBIFS some USB code,...) and cannot change the linux "struct device" Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Marek Vasut <marex@denx.de>
Diffstat (limited to 'drivers/core/root.c')
-rw-r--r--drivers/core/root.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/core/root.c b/drivers/core/root.c
index 407bc0d..4977875 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -24,7 +24,7 @@ static const struct driver_info root_info = {
.name = "root_driver",
};
-struct device *dm_root(void)
+struct udevice *dm_root(void)
{
if (!gd->dm_root) {
dm_warn("Virtual root driver does not exist!\n");