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_gpio.c | |
| parent | 9665fa8f9e1488209d5e01d0792c243e0a220c5a (diff) | |
| download | u-boot-imx-54c5d08a09e631f88738db54c75395c6457c2157.zip u-boot-imx-54c5d08a09e631f88738db54c75395c6457c2157.tar.gz u-boot-imx-54c5d08a09e631f88738db54c75395c6457c2157.tar.bz2 | |
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_gpio.c')
| -rw-r--r-- | common/cmd_gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_gpio.c b/common/cmd_gpio.c index aff0445..4634f91 100644 --- a/common/cmd_gpio.c +++ b/common/cmd_gpio.c @@ -30,7 +30,7 @@ static const char * const gpio_function[] = { "unknown", }; -static void show_gpio(struct device *dev, const char *bank_name, int offset) +static void show_gpio(struct udevice *dev, const char *bank_name, int offset) { struct dm_gpio_ops *ops = gpio_get_ops(dev); char buf[80]; @@ -62,7 +62,7 @@ static void show_gpio(struct device *dev, const char *bank_name, int offset) static int do_gpio_status(const char *gpio_name) { - struct device *dev; + struct udevice *dev; int newline = 0; int ret; |