diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-06-28 18:26:17 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-06-28 18:26:17 -0400 |
| commit | 9f84b6267ccde1bebe3f9cd40a91716b5ece5e20 (patch) | |
| tree | b51dcf9fb1b7205ed8134ad1169e73719897163d /include/uapi/linux | |
| parent | 719038de98bc8479b771c582a1e4a1e86079da22 (diff) | |
| parent | 5f8c4218148822fde6eebbeefc34bd0a6061e031 (diff) | |
Merge remote-tracking branch 'origin/x86/fpu' into queue/x86/cpu
Use the union of 3.10 x86/cpu and x86/fpu as baseline.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/virtio_console.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/virtio_console.h b/include/uapi/linux/virtio_console.h index ee13ab6c3614..c312f16bc4e7 100644 --- a/include/uapi/linux/virtio_console.h +++ b/include/uapi/linux/virtio_console.h | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | #define VIRTIO_CONSOLE_F_SIZE 0 /* Does host provide console size? */ | 39 | #define VIRTIO_CONSOLE_F_SIZE 0 /* Does host provide console size? */ |
| 40 | #define VIRTIO_CONSOLE_F_MULTIPORT 1 /* Does host provide multiple ports? */ | 40 | #define VIRTIO_CONSOLE_F_MULTIPORT 1 /* Does host provide multiple ports? */ |
| 41 | 41 | ||
| 42 | #define VIRTIO_CONSOLE_BAD_ID (~(u32)0) | 42 | #define VIRTIO_CONSOLE_BAD_ID (~(__u32)0) |
| 43 | 43 | ||
| 44 | struct virtio_console_config { | 44 | struct virtio_console_config { |
| 45 | /* colums of the screens */ | 45 | /* colums of the screens */ |