diff options
author | Greg Kroah-Hartman | 2010-08-05 23:18:03 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2010-08-05 23:18:03 +0200 |
commit | e9563355ac1175dd3440dc2ea5c28b27ed51a283 (patch) | |
tree | 8546d55832714b5d19ba4c7799266918ca04882e /drivers/staging/iio/adc/adc.h | |
parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow... (diff) | |
parent | Staging: ti-st: update TODO (diff) | |
download | kernel-qcow2-linux-e9563355ac1175dd3440dc2ea5c28b27ed51a283.tar.gz kernel-qcow2-linux-e9563355ac1175dd3440dc2ea5c28b27ed51a283.tar.xz kernel-qcow2-linux-e9563355ac1175dd3440dc2ea5c28b27ed51a283.zip |
Staging: Merge staging-next into Linus's tree
Conflicts:
drivers/staging/Kconfig
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audups11.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/adc/adc.h')
-rw-r--r-- | drivers/staging/iio/adc/adc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/iio/adc/adc.h b/drivers/staging/iio/adc/adc.h index 04eb16fd0a95..7841e6ad4349 100644 --- a/drivers/staging/iio/adc/adc.h +++ b/drivers/staging/iio/adc/adc.h @@ -26,3 +26,6 @@ _show, \ NULL, \ _addr) + +#define IIO_EVENT_CODE_IN_HIGH_THRESH(a) (IIO_EVENT_CODE_ADC_BASE + a) +#define IIO_EVENT_CODE_IN_LOW_THRESH(a) (IIO_EVENT_CODE_ADC_BASE + a + 32) |