diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-04 00:30:17 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-04 00:30:17 +0100 |
| commit | 18d8ff256f495bee7bcf016d9006d4b330e29260 (patch) | |
| tree | e3d01967862b312711e27bd790c57e20c723d0c1 /include | |
| parent | 2a0458773656240cf6fa97f1126c92dcddf8ab90 (diff) | |
| parent | 8c15abc94c737f9120d3d4a550abbcbb9be121f6 (diff) | |
Merge tag 'v3.10.14' into linux-linaro-lsk
This is the 3.10.14 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid.h | 4 | ||||
| -rw-r--r-- | include/linux/timex.h | 1 | ||||
| -rw-r--r-- | include/uapi/drm/radeon_drm.h | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index ff545cc33c3..6e185509046 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -749,6 +749,10 @@ void hid_output_report(struct hid_report *report, __u8 *data); struct hid_device *hid_allocate_device(void); struct hid_report *hid_register_report(struct hid_device *device, unsigned type, unsigned id); int hid_parse_report(struct hid_device *hid, __u8 *start, unsigned size); +struct hid_report *hid_validate_values(struct hid_device *hid, + unsigned int type, unsigned int id, + unsigned int field_index, + unsigned int report_counts); int hid_open_report(struct hid_device *device); int hid_check_keys_pressed(struct hid_device *hid); int hid_connect(struct hid_device *hid, unsigned int connect_mask); diff --git a/include/linux/timex.h b/include/linux/timex.h index b3726e61368..dd3edd7dfc9 100644 --- a/include/linux/timex.h +++ b/include/linux/timex.h @@ -141,6 +141,7 @@ extern int do_adjtimex(struct timex *); extern void hardpps(const struct timespec *, const struct timespec *); int read_current_timer(unsigned long *timer_val); +void ntp_notify_cmos_timer(void); /* The clock frequency of the i8253/i8254 PIT */ #define PIT_TICK_RATE 1193182ul diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h index 321d4ac5c51..fa8b3adf9ff 100644 --- a/include/uapi/drm/radeon_drm.h +++ b/include/uapi/drm/radeon_drm.h @@ -979,6 +979,8 @@ struct drm_radeon_cs { #define RADEON_INFO_RING_WORKING 0x15 /* SI tile mode array */ #define RADEON_INFO_SI_TILE_MODE_ARRAY 0x16 +/* query if CP DMA is supported on the compute ring */ +#define RADEON_INFO_SI_CP_DMA_COMPUTE 0x17 struct drm_radeon_info { |