diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-11-23 03:04:05 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-11-23 03:04:05 -0500 |
| commit | 92907cbbef8625bb3998d1eb385fc88f23c97a3f (patch) | |
| tree | 15626ff9287e37c3cb81c7286d6db5a7fd77c854 /include/uapi/linux/i2c-dev.h | |
| parent | 15fbfccfe92c62ae8d1ecc647c44157ed01ac02e (diff) | |
| parent | 1ec218373b8ebda821aec00bb156a9c94fad9cd4 (diff) | |
Merge tag 'v4.4-rc2' into drm-intel-next-queued
Linux 4.4-rc2
Backmerge to get at
commit 1b0e3a049efe471c399674fd954500ce97438d30
Author: Imre Deak <imre.deak@intel.com>
Date: Thu Nov 5 23:04:11 2015 +0200
drm/i915/skl: disable display side power well support for now
so that we can proplery re-eanble skl power wells in -next.
Conflicts are just adjacent lines changed, except for intel_fbdev.c
where we need to interleave the changs. Nothing nefarious.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/uapi/linux/i2c-dev.h')
| -rw-r--r-- | include/uapi/linux/i2c-dev.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/uapi/linux/i2c-dev.h b/include/uapi/linux/i2c-dev.h index 3f311551795d..2f05e66de01e 100644 --- a/include/uapi/linux/i2c-dev.h +++ b/include/uapi/linux/i2c-dev.h | |||
| @@ -66,7 +66,9 @@ struct i2c_rdwr_ioctl_data { | |||
| 66 | __u32 nmsgs; /* number of i2c_msgs */ | 66 | __u32 nmsgs; /* number of i2c_msgs */ |
| 67 | }; | 67 | }; |
| 68 | 68 | ||
| 69 | #define I2C_RDRW_IOCTL_MAX_MSGS 42 | 69 | #define I2C_RDWR_IOCTL_MAX_MSGS 42 |
| 70 | /* Originally defined with a typo, keep it for compatibility */ | ||
| 71 | #define I2C_RDRW_IOCTL_MAX_MSGS I2C_RDWR_IOCTL_MAX_MSGS | ||
| 70 | 72 | ||
| 71 | 73 | ||
| 72 | #endif /* _UAPI_LINUX_I2C_DEV_H */ | 74 | #endif /* _UAPI_LINUX_I2C_DEV_H */ |