diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
| commit | e9563355ac1175dd3440dc2ea5c28b27ed51a283 (patch) | |
| tree | 8546d55832714b5d19ba4c7799266918ca04882e /drivers/staging/iio/light/light.h | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
| parent | Staging: ti-st: update TODO (diff) | |
| download | linux-dev-e9563355ac1175dd3440dc2ea5c28b27ed51a283.tar.xz linux-dev-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/light/light.h')
| -rw-r--r-- | drivers/staging/iio/light/light.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/iio/light/light.h b/drivers/staging/iio/light/light.h index f00f827689c2..e4e1e2c4139c 100644 --- a/drivers/staging/iio/light/light.h +++ b/drivers/staging/iio/light/light.h @@ -2,11 +2,6 @@ /* Light to digital sensor attributes */ -#define IIO_DEV_ATTR_LIGHT_INFRARED(_num, _show, _addr) \ - IIO_DEVICE_ATTR(light_infrared##_num, S_IRUGO, _show, NULL, _addr) +#define IIO_EVENT_CODE_LIGHT_THRESH IIO_EVENT_CODE_LIGHT_BASE -#define IIO_DEV_ATTR_LIGHT_BROAD(_num, _show, _addr) \ - IIO_DEVICE_ATTR(light_broadspectrum##_num, S_IRUGO, _show, NULL, _addr) -#define IIO_DEV_ATTR_LIGHT_VISIBLE(_num, _show, _addr) \ - IIO_DEVICE_ATTR(light_visible##_num, S_IRUGO, _show, NULL, _addr) |