path: root/include/dm-demo.h
diff options
authorHeiko Schocher <>2014-05-22 12:43:05 +0200
committerTom Rini <>2014-05-27 10:21:32 -0400
commit54c5d08a09e631f88738db54c75395c6457c2157 (patch)
tree989241d18408f19062618bc380ef5948154f2334 /include/dm-demo.h
parent9665fa8f9e1488209d5e01d0792c243e0a220c5a (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 <> Cc: Simon Glass <> Cc: Marek Vasut <>
Diffstat (limited to 'include/dm-demo.h')
1 files changed, 5 insertions, 5 deletions
diff --git a/include/dm-demo.h b/include/dm-demo.h
index 6e38d3c5b3..a24fec6658 100644
--- a/include/dm-demo.h
+++ b/include/dm-demo.h
@@ -23,14 +23,14 @@ struct dm_demo_pdata {
struct demo_ops {
- int (*hello)(struct device *dev, int ch);
- int (*status)(struct device *dev, int *status);
+ int (*hello)(struct udevice *dev, int ch);
+ int (*status)(struct udevice *dev, int *status);
-int demo_hello(struct device *dev, int ch);
-int demo_status(struct device *dev, int *status);
+int demo_hello(struct udevice *dev, int ch);
+int demo_status(struct udevice *dev, int *status);
int demo_list(void);
-int demo_parse_dt(struct device *dev);
+int demo_parse_dt(struct udevice *dev);
OpenPOWER on IntegriCloud