diff options
| author | Tom Rini <trini@ti.com> | 2015-02-21 08:22:23 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-21 08:22:23 -0500 |
| commit | b4087b354a888928f87386dc46091e672e14be97 (patch) | |
| tree | 09b7045b65a1eef2dd8ff8df30bafb030910f528 /include/dm | |
| parent | ed16f14689b98c1ec98c9f30b92b8edea9d2d60c (diff) | |
| parent | 66c03151fc8752c29b7d17003b9c87218640b10b (diff) | |
| download | u-boot-imx-b4087b354a888928f87386dc46091e672e14be97.zip u-boot-imx-b4087b354a888928f87386dc46091e672e14be97.tar.gz u-boot-imx-b4087b354a888928f87386dc46091e672e14be97.tar.bz2 | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'include/dm')
| -rw-r--r-- | include/dm/device-internal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h index f0cc794..e2418fe 100644 --- a/include/dm/device-internal.h +++ b/include/dm/device-internal.h @@ -101,7 +101,11 @@ static inline int device_remove(struct udevice *dev) { return 0; } * @dev: Pointer to device to unbind * @return 0 if OK, -ve on error */ +#ifdef CONFIG_DM_DEVICE_REMOVE int device_unbind(struct udevice *dev); +#else +static inline int device_unbind(struct udevice *dev) { return 0; } +#endif #ifdef CONFIG_DM_DEVICE_REMOVE void device_free(struct udevice *dev); |