backports: add backport prefix to devm_regulator_register()
authorHauke Mehrtens <hauke@hauke-m.de>
Thu, 24 Oct 2013 20:18:15 +0000 (22:18 +0200)
committerHauke Mehrtens <hauke@hauke-m.de>
Thu, 24 Oct 2013 21:01:36 +0000 (23:01 +0200)
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>
backport/backport-include/linux/regulator/driver.h

index f56990bf8ddbbdd60946700ef6aa70b3ff080efc..e1604bf495c36438895520f5bc3a00198ecf6f8f 100644 (file)
@@ -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)) */