1
0
Fork 0
alistair23-linux/drivers/iio
Greg Kroah-Hartman 8deab4754c staging: iio: fix up merge error
Fix up a build merge error in drivers/iio/accel/bma180.c that I caused.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-22 07:54:10 -07:00
..
accel staging: iio: fix up merge error 2014-09-22 07:54:10 -07:00
adc Merge 3.17-rc6 into staging-next. 2014-09-22 07:30:03 -07:00
amplifiers iio: amplifiers: ad8366: Remove regulator_put 2013-09-28 11:49:45 +01:00
common Merge 3.17-rc6 into staging-next. 2014-09-22 07:30:03 -07:00
dac iio: add support of the max5821 2014-07-27 14:21:35 +01:00
frequency Merge 3.12-rc6 into staging-next. 2013-10-19 13:14:34 -07:00
gyro Merge 3.17-rc6 into staging-next. 2014-09-22 07:30:03 -07:00
humidity iio: remove .owner field for driver using module_platform_driver 2014-08-26 21:08:38 +01:00
imu Merge 3.17-rc6 into staging-next. 2014-09-22 07:30:03 -07:00
light iio: Add Dyna-Image AL3320A ambient light sensor driver 2014-09-10 20:25:56 +01:00
magnetometer Merge 3.17-rc6 into staging-next. 2014-09-22 07:30:03 -07:00
orientation iio: remove .owner field for driver using module_platform_driver 2014-08-26 21:08:38 +01:00
pressure iio: remove .owner field for driver using module_platform_driver 2014-08-26 21:08:38 +01:00
proximity iio: Remove timestamp argument from iio_trigger_poll() and iio_trigger_poll_chained() 2014-06-14 16:25:59 +01:00
temperature iio: Add Melexis mlx90614 contact-less infrared temperature sensor driver 2014-05-03 11:38:13 +01:00
trigger iio: remove .owner field for driver using module_platform_driver 2014-08-26 21:08:38 +01:00
Kconfig iio: always select ANON_INODES 2014-05-10 11:39:57 +01:00
Makefile iio: Add AS3935 lightning sensor support 2014-03-16 18:00:32 +00:00
buffer_cb.c iio get rid of unneccessary error_ret 2014-02-18 08:46:36 +00:00
iio_core.h IIO: core: Introduce read_raw_multi 2014-04-29 22:05:32 +01:00
iio_core_trigger.h iio: fix semicolon in io_core_trigger.h 2013-08-03 18:40:32 +01:00
industrialio-buffer.c 1st round of new IIO drivers, functionality and cleanups for the 3.18 cycle. 2014-08-25 11:09:35 -07:00
industrialio-core.c iio: types: Added support for rotation from north usage attributes 2014-07-20 13:34:45 +01:00
industrialio-event.c Staging driver patches for 3.17-rc1 2014-08-04 18:36:12 -07:00
industrialio-trigger.c iio: Remove timestamp argument from iio_trigger_poll() and iio_trigger_poll_chained() 2014-06-14 16:25:59 +01:00
industrialio-triggered-buffer.c iio:triggered-buffer: Remove redundant call to iio_sw_buffer_preenable(). 2013-10-16 19:12:47 +01:00
inkern.c iio:inkern: fix overwritten -EPROBE_DEFER in of_iio_channel_get_by_name 2014-08-25 16:55:28 +01:00
kfifo_buf.c iio: kfifo_buf: Implement data_available() callback 2013-12-03 20:22:28 +00:00