diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-24 22:18:15 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-24 23:01:36 +0200 |
| commit | ec4ca3eb6c30817904279ccf1e2e1c2fc4dd277f (patch) | |
| tree | 9f373aba7a0c9845280243c4beae1460bb905f85 | |
| parent | cbfa58fc37c567e97a2d33e96b8cebd886b1827f (diff) | |
backports: add backport prefix to devm_regulator_register()
Use LINUX_BACKPORT() to prevent a collision with some backported
patches in the kernel backports is being compiled against.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | backport/backport-include/linux/regulator/driver.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/backport/backport-include/linux/regulator/driver.h b/backport/backport-include/linux/regulator/driver.h index f56990bf..e1604bf4 100644 --- a/backport/backport-include/linux/regulator/driver.h +++ b/backport/backport-include/linux/regulator/driver.h @@ -25,10 +25,12 @@ int regulator_map_voltage_ascend(struct regulator_dev *rdev, #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0)) && \ (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) +#define devm_regulator_register LINUX_BACKPORT(devm_regulator_register) struct regulator_dev * devm_regulator_register(struct device *dev, const struct regulator_desc *regulator_desc, const struct regulator_config *config); +#define devm_regulator_unregister LINUX_BACKPORT(devm_regulator_unregister) void devm_regulator_unregister(struct device *dev, struct regulator_dev *rdev); #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0)) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) */ |