On Thu, 04 Apr 2013 12:31:06 +0200, Paul Bolle wrote: > In v3.2 the Analog Devices ADT75 temperature sensor driver was removed > as an IIO driver and support for it was added to the LM75 HWMON driver. > But it was apparently overlooked to rename one reference to CONFIG_ADT75 > to CONFIG_SENSORS_LM75. Do so now. Use the IS_ENABLED() macro, while > we're at it. > > Signed-off-by: Paul Bolle <pebo...@tiscali.nl> > --- > 0) Also untested. > > 1) See commits e96f9d89e6213c7630a3323cd0c754e7f2619564 ("hwmon: (lm75) > Add support for Analog Devices ADT75") and > cdea0bec8d37f2943ae500512b0c178bc76de6e3 ("iio: adc: remove ADT75 driver > - hwmon/lm75 will take over ADT75 support") for the two patches involved > in this operation. > > arch/blackfin/mach-bf537/boards/stamp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-)
This breakage is telling us something about the weird approach taken in this file, methinks. > diff --git a/arch/blackfin/mach-bf537/boards/stamp.c > b/arch/blackfin/mach-bf537/boards/stamp.c > index b40b849..9735345 100644 > --- a/arch/blackfin/mach-bf537/boards/stamp.c > +++ b/arch/blackfin/mach-bf537/boards/stamp.c > @@ -2221,7 +2221,7 @@ static struct i2c_board_info __initdata > bfin_i2c_board_info[] = { > }, > #endif > > -#if defined(CONFIG_ADT75) || defined(CONFIG_ADT75_MODULE) > +#if IS_ENABLED(CONFIG_SENSORS_LM75) > { > I2C_BOARD_INFO("adt75", 0x9), Unrelated to this patch, but this is very odd, as the ADT75 can't have slave address 0x09. This address is almost exclusively used by battery chargers AFAIK. > .irq = IRQ_PG5, The patch itself looks good. Reviewed-by: Jean Delvare <kh...@linux-fr.org> -- Jean Delvare -- 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/