On 10/03/2016 09:26 PM, Jonathan Cameron wrote: > In the early days of IIO we were much more inclined to keep the impact > of the core IIO elements to the minimum. As time has moved on it has > become clear that hardly any builds are done without buffer support > and that it adds considerable complexity to the drivers. > > Hence merge down the buffer and non buffer elements of the sca3000 driver > also allowing us to drop the header file used for the interfaces between > the two. > > Signed-off-by: Jonathan Cameron <jic23@xxxxxxxxxx> > --- > drivers/staging/iio/accel/Makefile | 3 +- > .../iio/accel/{sca3000_core.c => sca3000.c} | 498 ++++++++++++++++++++- > drivers/staging/iio/accel/sca3000.h | 279 ------------ > drivers/staging/iio/accel/sca3000_ring.c | 350 --------------- > 4 files changed, 496 insertions(+), 634 deletions(-) > > diff --git a/drivers/staging/iio/accel/Makefile b/drivers/staging/iio/accel/Makefile > index 1810a434a755..6ab95708e696 100644 > --- a/drivers/staging/iio/accel/Makefile > +++ b/drivers/staging/iio/accel/Makefile > @@ -14,5 +14,4 @@ obj-$(CONFIG_ADIS16209) += adis16209.o > adis16240-y := adis16240_core.o > obj-$(CONFIG_ADIS16240) += adis16240.o > > -sca3000-y := sca3000_core.o sca3000_ring.o > -obj-$(CONFIG_SCA3000) += sca3000.o > +obj-$(CONFIG_SCA3000) := sca3000.o This is fixed when moving the driver out of staging, but using := instead of += here disables all other drivers that came before this one. -- 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