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@xxxxxxxxxx>
---
backport/backport-include/linux/regulator/driver.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/backport/backport-include/linux/regulator/driver.h b/backport/backport-include/linux/regulator/driver.h
index f56990b..e1604bf 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)) */
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
