From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Jun 2013 03:39:06 +0000 (+1000)
Subject: Merge remote-tracking branch 'virtio/virtio-next'
X-Git-Tag: next-20130628~61
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0e02895c690414615d069c6825e81612369b084b;p=karo-tx-linux.git

Merge remote-tracking branch 'virtio/virtio-next'
---

0e02895c690414615d069c6825e81612369b084b
diff --cc include/uapi/linux/virtio_console.h
index c312f16bc4e7,3fd0dce3cb25..ba260dd0b33a
--- a/include/uapi/linux/virtio_console.h
+++ b/include/uapi/linux/virtio_console.h
@@@ -38,8 -38,9 +38,9 @@@
  /* Feature bits */
  #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_F_EMERG_WRITE 2 /* Does host support emergency write? */
  
 -#define VIRTIO_CONSOLE_BAD_ID		(~(u32)0)
 +#define VIRTIO_CONSOLE_BAD_ID		(~(__u32)0)
  
  struct virtio_console_config {
  	/* colums of the screens */