diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-25 09:18:11 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-25 09:18:11 +0200 |
| commit | 43a3beb6da994549ec28a9f31727b997a025f958 (patch) | |
| tree | 9fea6f7e2abd5ba7ce4d5f725a8ceed0a4e0ab80 /drivers/staging/iio/adc/ad7887.h | |
| parent | c3b92c8787367a8bb53d57d9789b558f1295cc96 (diff) | |
| parent | 68cf162a1af23c35db8e3b78659c99196c9882ff (diff) | |
| download | op-kernel-dev-43a3beb6da994549ec28a9f31727b997a025f958.zip op-kernel-dev-43a3beb6da994549ec28a9f31727b997a025f958.tar.gz | |
Merge branch 'staging-next' into Linux 3.1
This was done to resolve a conflict in the
drivers/staging/comedi/drivers/ni_labpc.c file that resolved a build
bugfix in Linus's tree with a "better" bugfix that was in the
staging-next tree that resolved the issue in a more complete manner.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/adc/ad7887.h')
| -rw-r--r-- | drivers/staging/iio/adc/ad7887.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/iio/adc/ad7887.h b/drivers/staging/iio/adc/ad7887.h index 837046c..3452d18 100644 --- a/drivers/staging/iio/adc/ad7887.h +++ b/drivers/staging/iio/adc/ad7887.h @@ -82,12 +82,12 @@ enum ad7887_supported_device_ids { ID_AD7887 }; -#ifdef CONFIG_IIO_RING_BUFFER -int ad7887_scan_from_ring(struct ad7887_state *st, long mask); +#ifdef CONFIG_IIO_BUFFER +int ad7887_scan_from_ring(struct ad7887_state *st, int channum); int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev); void ad7887_ring_cleanup(struct iio_dev *indio_dev); -#else /* CONFIG_IIO_RING_BUFFER */ -static inline int ad7887_scan_from_ring(struct ad7887_state *st, long mask) +#else /* CONFIG_IIO_BUFFER */ +static inline int ad7887_scan_from_ring(struct ad7887_state *st, int channum) { return 0; } @@ -101,5 +101,5 @@ ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev) static inline void ad7887_ring_cleanup(struct iio_dev *indio_dev) { } -#endif /* CONFIG_IIO_RING_BUFFER */ +#endif /* CONFIG_IIO_BUFFER */ #endif /* IIO_ADC_AD7887_H_ */ |
