[adding cc list again] Hello Pali,
On 08/31/2015 09:17 AM, Pali Rohár wrote: > On Monday 31 August 2015 01:18:35 Javier Martinez Canillas wrote: >> These drivers already have an I2C device id table that is used to create >> module aliases and the used MODULE_ALIAS() was either already in the I2C >> table so it was redundant or wasn't a valid I2C id so it was never used. >> >> Signed-off-by: Javier Martinez Canillas <jav...@osg.samsung.com> >> >> --- >> >> diff --git a/drivers/power/bq27x00_battery.c >> b/drivers/power/bq27x00_battery.c >> index 8287261fd978..d0b2f3b47b8f 100644 >> --- a/drivers/power/bq27x00_battery.c >> +++ b/drivers/power/bq27x00_battery.c >> @@ -1120,10 +1120,6 @@ module_exit(bq27x00_battery_exit); >> MODULE_ALIAS("platform:bq27000-battery"); >> #endif >> >> -#ifdef CONFIG_BATTERY_BQ27X00_I2C >> -MODULE_ALIAS("i2c:bq27000-battery"); >> -#endif >> - >> MODULE_AUTHOR("Rodolfo Giometti <giome...@linux.it>"); >> MODULE_DESCRIPTION("BQ27x00 battery monitor driver"); >> MODULE_LICENSE("GPL"); > > Hi! This part of patch is already in queue list. So then your patch will > conflict with other pending patches... > Sorry, with which patch it will conflict? It applies cleanly on top of the power supply git tree next branch: https://git.kernel.org/cgit/linux/kernel/git/sre/linux-power-supply.git/log/?h=next Best regards, -- Javier Martinez Canillas Open Source Group Samsung Research America -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/