diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-06 14:05:34 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-06 14:05:34 +1000 |
| commit | 37c35f6f5b758bc580a4516e4246844e284fede5 (patch) | |
| tree | caafbbf10fee7aa07134cc06bcef4fd59dedd6ba /drivers/staging/iio/adc/Makefile | |
| parent | ff5f50d37e83d67b47c5d4664f7e86323887a809 (diff) | |
| parent | aeef33fad6183cdaf7a28ad5b9695e35fea6576f (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/arlan/arlan-main.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/cx25821/cx25821-alsa.c
drivers/staging/dt3155/dt3155_drv.c
drivers/staging/netwave/netwave_cs.c
Diffstat (limited to 'drivers/staging/iio/adc/Makefile')
| -rw-r--r-- | drivers/staging/iio/adc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/adc/Makefile b/drivers/staging/iio/adc/Makefile index 08cee5c22b92..18c9376ecbb2 100644 --- a/drivers/staging/iio/adc/Makefile +++ b/drivers/staging/iio/adc/Makefile @@ -3,6 +3,6 @@ # max1363-y := max1363_core.o -max1363-$(CONFIG_MAX1363_RING_BUFFER) += max1363_ring.o +max1363-y += max1363_ring.o obj-$(CONFIG_MAX1363) += max1363.o |