From: Hauke Mehrtens Date: Thu, 24 Oct 2013 20:18:15 +0000 (+0200) Subject: backports: add backport prefix to devm_regulator_register() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ec4ca3eb6c30817904279ccf1e2e1c2fc4dd277f;p=openwrt%2Fstaging%2Fblogic.git 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 --- diff --git a/backport/backport-include/linux/regulator/driver.h b/backport/backport-include/linux/regulator/driver.h index f56990bf8ddb..e1604bf495c3 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)) */