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

…

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

…

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

buffer_cb.c

…

iio_core_trigger.h

…

iio_core.h

…

industrialio-buffer.c

Merge tag 'iio-for-3.18a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into work-next

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

Merge tag 'staging-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

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

…

inkern.c

iio:inkern: fix overwritten -EPROBE_DEFER in of_iio_channel_get_by_name

2014-08-25 16:55:28 +01:00

Kconfig

iio: always select ANON_INODES

2014-05-10 11:39:57 +01:00

kfifo_buf.c

…

Makefile

…