diff options
| author | Heiko Schocher <hs@denx.de> | 2014-05-22 10:43:05 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-27 14:21:32 (GMT) |
| commit | 54c5d08a09e631f88738db54c75395c6457c2157 (patch) | |
| tree | 989241d18408f19062618bc380ef5948154f2334 /include/dm/root.h | |
| parent | 9665fa8f9e1488209d5e01d0792c243e0a220c5a (diff) | |
| download | u-boot-fsl-qoriq-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 'include/dm/root.h')
| -rw-r--r-- | include/dm/root.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/dm/root.h b/include/dm/root.h index 0ebccda..3018bc8 100644 --- a/include/dm/root.h +++ b/include/dm/root.h @@ -10,7 +10,7 @@ #ifndef _DM_ROOT_H_ #define _DM_ROOT_H_ -struct device; +struct udevice; /** * dm_root() - Return pointer to the top of the driver tree @@ -19,7 +19,7 @@ struct device; * * @return pointer to root device, or NULL if not inited yet */ -struct device *dm_root(void); +struct udevice *dm_root(void); /** * dm_scan_platdata() - Scan all platform data and bind drivers |