diff options
| author | Heiko Schocher <hs@denx.de> | 2014-05-22 12:43:05 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-27 10:21:32 -0400 |
| commit | 54c5d08a09e631f88738db54c75395c6457c2157 (patch) | |
| tree | 989241d18408f19062618bc380ef5948154f2334 /common/cmd_demo.c | |
| parent | 9665fa8f9e1488209d5e01d0792c243e0a220c5a (diff) | |
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 'common/cmd_demo.c')
| -rw-r--r-- | common/cmd_demo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_demo.c b/common/cmd_demo.c index a3bba7fdf3..652c61c707 100644 --- a/common/cmd_demo.c +++ b/common/cmd_demo.c @@ -11,7 +11,7 @@ #include <dm-demo.h> #include <asm/io.h> -struct device *demo_dev; +struct udevice *demo_dev; static int do_demo_hello(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) @@ -41,7 +41,7 @@ static int do_demo_status(cmd_tbl_t *cmdtp, int flag, int argc, int do_demo_list(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - struct device *dev; + struct udevice *dev; int i, ret; puts("Demo uclass entries:\n"); |