diff --git a/[refs] b/[refs] index 6e7492ae3974..c1d64a69b627 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4028437876866aba4747a655ede00f892089e14 +refs/heads/master: a5b8b1ada6dd76503884f5492b995cd29eefae0f diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h index c0bd23048be0..3f33f17f556c 100644 --- a/trunk/include/linux/device.h +++ b/trunk/include/linux/device.h @@ -494,6 +494,11 @@ static inline struct device *root_device_register(const char *name) } extern void root_device_unregister(struct device *root); +static inline void *dev_get_platdata(const struct device *dev) +{ + return dev->platform_data; +} + /* * Manual binding of a device to driver. See drivers/base/bus.c * for information on use.