diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-09-10 14:53:27 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-09-10 15:04:19 +0200 |
| commit | d5bbf34613a877dbe3da847fa0432da8c6721e73 (patch) | |
| tree | 902a90fd7eda61aad7abae9c35b0da2e7a786995 /include/linux/lightsensor.h | |
| parent | c6c1f7a2c194f1a2291a15c6691c0d6785f8976e (diff) | |
| parent | 336961dd3cf9c39456dd9657e8f205718740c797 (diff) | |
Merge branch 'l4t/l4t-r16' into colibri
Merge with latest NVIDIA L4T R16.
Only real conflict concerning inverted VBUS gpio support.
Diffstat (limited to 'include/linux/lightsensor.h')
| -rw-r--r-- | include/linux/lightsensor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/lightsensor.h b/include/linux/lightsensor.h index 7a87853ac064..fc683fd786ac 100644 --- a/include/linux/lightsensor.h +++ b/include/linux/lightsensor.h @@ -24,5 +24,6 @@ #define LIGHTSENSOR_IOCTL_GET_ENABLED _IOR(LIGHTSENSOR_IOCTL_MAGIC, 1, int *) #define LIGHTSENSOR_IOCTL_ENABLE _IOW(LIGHTSENSOR_IOCTL_MAGIC, 2, int *) +#define LIGHTSENSOR_IOCTL_SET_DELAY _IOW(LIGHTSENSOR_IOCTL_MAGIC, 3, int *) #endif |