On 09/01/15 09:39, Daniel Baluta wrote: > After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is > selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks > depending on CONFIG_PM_RUNTIME may now be changed to depend on > CONFIG_PM. > > Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere under > drivers/iio/imu/kmx61.c > > Signed-off-by: Daniel Baluta <daniel.baluta@xxxxxxxxx> Acked-by: Jonathan Cameron <jic23@xxxxxxxxxx> Thanks Daniel and thanks Greg. Should have thought to give a preemptive ack earlier! Jonathan > --- > This fixes build break when merging iio patches for 3.20 > into Greg's tree. > http://marc.info/?l=linux-iio&m=142077015029632&w=2 > > drivers/iio/imu/kmx61.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c > index 841b033..4e2605e 100644 > --- a/drivers/iio/imu/kmx61.c > +++ b/drivers/iio/imu/kmx61.c > @@ -735,7 +735,7 @@ static int kmx61_setup_any_motion_interrupt(struct kmx61_data *data, > */ > static int kmx61_set_power_state(struct kmx61_data *data, bool on, u8 device) > { > -#ifdef CONFIG_PM_RUNTIME > +#ifdef CONFIG_PM > int ret; > > if (device & KMX61_ACC) { > @@ -1523,7 +1523,7 @@ static int kmx61_resume(struct device *dev) > } > #endif > > -#ifdef CONFIG_PM_RUNTIME > +#ifdef CONFIG_PM > static int kmx61_runtime_suspend(struct device *dev) > { > struct kmx61_data *data = i2c_get_clientdata(to_i2c_client(dev)); > -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
