diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-06-12 07:00:35 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-06-12 07:00:35 -0700 |
| commit | f445d05328a2d627c2fb70c79d8b01455c254609 (patch) | |
| tree | e46c5f112ba429f836c0c63719b928a8e14fb131 /include/uapi/linux | |
| parent | 668468b161745df666b75fbfb76d14155b0f9df6 (diff) | |
| parent | 3d85f548d3c84a13dc54cc9c79249c5fdae2ad36 (diff) | |
Merge branch 'dss-regulator' into omap-for-v3.11/fixes-non-critical
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 @@ #define VIRTIO_CONSOLE_F_SIZE 0 /* Does host provide console size? */ #define VIRTIO_CONSOLE_F_MULTIPORT 1 /* Does host provide multiple ports? */ -#define VIRTIO_CONSOLE_BAD_ID (~(u32)0) +#define VIRTIO_CONSOLE_BAD_ID (~(__u32)0) struct virtio_console_config { /* colums of the screens */ |