diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-24 20:35:03 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-24 20:35:03 +1100 |
| commit | ef91dd9ad5b8c2a43866f423238cbd1271379131 (patch) | |
| tree | d4b6aab88959682fb86839c3202f3cbc56d60a27 /drivers/staging/iio/adc/max1363.h | |
| parent | b5ed8349ee33c7e04f4190f5e4f50450f3e470f3 (diff) | |
| parent | 8a7607dd5be83ba7c538e16be01d091927dd70e7 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/comedi/drivers/ni_labpc_cs.c
drivers/staging/comedi/drivers/ni_mio_cs.c
Diffstat (limited to 'drivers/staging/iio/adc/max1363.h')
| -rw-r--r-- | drivers/staging/iio/adc/max1363.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/iio/adc/max1363.h b/drivers/staging/iio/adc/max1363.h index 8aca81f14d0b..c112fbef2705 100644 --- a/drivers/staging/iio/adc/max1363.h +++ b/drivers/staging/iio/adc/max1363.h @@ -228,7 +228,7 @@ struct max1363_state { struct iio_trigger *trig; struct regulator *reg; }; -#ifdef CONFIG_IIO_RING_BUFFER +#ifdef CONFIG_MAX1363_RING_BUFFER ssize_t max1363_scan_from_ring(struct device *dev, struct device_attribute *attr, @@ -239,7 +239,7 @@ void max1363_ring_cleanup(struct iio_dev *indio_dev); int max1363_initialize_ring(struct iio_ring_buffer *ring); void max1363_uninitialize_ring(struct iio_ring_buffer *ring); -#else /* CONFIG_IIO_RING_BUFFER */ +#else /* CONFIG_MAX1363_RING_BUFFER */ static inline void max1363_uninitialize_ring(struct iio_ring_buffer *ring) { @@ -265,5 +265,5 @@ max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev) }; static inline void max1363_ring_cleanup(struct iio_dev *indio_dev) {}; -#endif /* CONFIG_IIO_RING_BUFFER */ +#endif /* CONFIG_MAX1363_RING_BUFFER */ #endif /* _MAX1363_H_ */ |