Merge branch 'x86/uaccess' into core/percpu

[linux-2.6-omap-h63xx.git] / include / linux / virtio_console.h

diff --git a/include/linux/virtio_console.h b/include/linux/virtio_console.h
index 19a0da0dba41203a59d5d2bce2762d2c2b78a240..dc161115ae35acdcfd3d54732f7f887194d9cbc1 100644 (file)
--- a/include/linux/virtio_console.h
+++ b/include/linux/virtio_console.h
@@ -1,5 +1,6 @@
 #ifndef _LINUX_VIRTIO_CONSOLE_H
 #define _LINUX_VIRTIO_CONSOLE_H
+#include <linux/types.h>
 #include <linux/virtio_config.h>
 /* This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so
  * anyone can use the definitions to implement compatible drivers/servers. */
@@ -7,6 +8,17 @@
 /* The ID for virtio console */
 #define VIRTIO_ID_CONSOLE      3
 
+/* Feature bits */
+#define VIRTIO_CONSOLE_F_SIZE  0       /* Does host provide console size? */
+
+struct virtio_console_config {
+       /* colums of the screens */
+       __u16 cols;
+       /* rows of the screens */
+       __u16 rows;
+} __attribute__((packed));
+
+
 #ifdef __KERNEL__
 int __init virtio_cons_early_init(int (*put_chars)(u32, const char *, int));
 #endif /* __KERNEL__ */