diff options
| author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2015-07-06 12:10:57 +1000 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-07-06 17:59:01 +0200 |
| commit | 25b8b39b6d7de95d0dd5ae7b66b3ac4b9b83e060 (patch) | |
| tree | 55655c02e643843162bf89ea564cf14ceae940e2 /include/standard-headers | |
| parent | 7edd8e4660beb301d527257f8e04ebec0f841cb0 (diff) | |
| download | qemu-25b8b39b6d7de95d0dd5ae7b66b3ac4b9b83e060.zip qemu-25b8b39b6d7de95d0dd5ae7b66b3ac4b9b83e060.tar.gz qemu-25b8b39b6d7de95d0dd5ae7b66b3ac4b9b83e060.tar.bz2 | |
linux-headers: Update to 4.2-rc1
This updates linux-headers against master 4.2-rc1 (commit
d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754). This is the result of
./scripts/update-linux-headers.sh work.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/standard-headers')
| -rw-r--r-- | include/standard-headers/linux/input.h | 10 | ||||
| -rw-r--r-- | include/standard-headers/linux/virtio_balloon.h | 1 | ||||
| -rw-r--r-- | include/standard-headers/linux/virtio_gpu.h | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/include/standard-headers/linux/input.h b/include/standard-headers/linux/input.h index b94d365..a459dd2 100644 --- a/include/standard-headers/linux/input.h +++ b/include/standard-headers/linux/input.h @@ -367,7 +367,8 @@ struct input_keymap_entry { #define KEY_MSDOS 151 #define KEY_COFFEE 152 /* AL Terminal Lock/Screensaver */ #define KEY_SCREENLOCK KEY_COFFEE -#define KEY_DIRECTION 153 +#define KEY_ROTATE_DISPLAY 153 /* Display orientation for e.g. tablets */ +#define KEY_DIRECTION KEY_ROTATE_DISPLAY #define KEY_CYCLEWINDOWS 154 #define KEY_MAIL 155 #define KEY_BOOKMARKS 156 /* AC Bookmarks */ @@ -700,6 +701,10 @@ struct input_keymap_entry { #define KEY_NUMERIC_9 0x209 #define KEY_NUMERIC_STAR 0x20a #define KEY_NUMERIC_POUND 0x20b +#define KEY_NUMERIC_A 0x20c /* Phone key A - HUT Telephony 0xb9 */ +#define KEY_NUMERIC_B 0x20d +#define KEY_NUMERIC_C 0x20e +#define KEY_NUMERIC_D 0x20f #define KEY_CAMERA_FOCUS 0x210 #define KEY_WPS_BUTTON 0x211 /* WiFi Protected Setup key */ @@ -971,7 +976,8 @@ struct input_keymap_entry { */ #define MT_TOOL_FINGER 0 #define MT_TOOL_PEN 1 -#define MT_TOOL_MAX 1 +#define MT_TOOL_PALM 2 +#define MT_TOOL_MAX 2 /* * Values describing the status of a force-feedback effect diff --git a/include/standard-headers/linux/virtio_balloon.h b/include/standard-headers/linux/virtio_balloon.h index 88ada1d..2e2a6dc 100644 --- a/include/standard-headers/linux/virtio_balloon.h +++ b/include/standard-headers/linux/virtio_balloon.h @@ -26,6 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include "standard-headers/linux/types.h" +#include "standard-headers/linux/virtio_types.h" #include "standard-headers/linux/virtio_ids.h" #include "standard-headers/linux/virtio_config.h" diff --git a/include/standard-headers/linux/virtio_gpu.h b/include/standard-headers/linux/virtio_gpu.h index cfcfb46..72ef815 100644 --- a/include/standard-headers/linux/virtio_gpu.h +++ b/include/standard-headers/linux/virtio_gpu.h @@ -38,6 +38,8 @@ #ifndef VIRTIO_GPU_HW_H #define VIRTIO_GPU_HW_H +#include "standard-headers/linux/types.h" + enum virtio_gpu_ctrl_type { VIRTIO_GPU_UNDEFINED = 0, |