diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-26 15:05:45 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-26 15:05:45 -0500 |
| commit | 3978f4612e7aa90469f6b1e0a04524833e77fbc6 (patch) | |
| tree | f8e7cae29d2cbebf78018554c5388afd3c41160a /hw/xenfb.c | |
| parent | 7a542b67b32742ff5fe286f819df891d1df7bf56 (diff) | |
| parent | e108a3c110506faf3ef43448be3e0d39ef0ead8f (diff) | |
Merge remote-tracking branch 'sstabellini/compile-xs' into staging
* sstabellini/compile-xs:
xenstore: Use <xenstore.h>
xen: Reorganize includes of Xen headers.
Diffstat (limited to 'hw/xenfb.c')
| -rw-r--r-- | hw/xenfb.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/hw/xenfb.c b/hw/xenfb.c index 1bcf171b01..338800a4d9 100644 --- a/hw/xenfb.c +++ b/hw/xenfb.c @@ -35,19 +35,16 @@ #include <string.h> #include <time.h> -#include <xs.h> -#include <xenctrl.h> -#include <xen/event_channel.h> -#include <xen/io/xenbus.h> -#include <xen/io/fbif.h> -#include <xen/io/kbdif.h> -#include <xen/io/protocols.h> - #include "hw.h" #include "console.h" #include "qemu-char.h" #include "xen_backend.h" +#include <xen/event_channel.h> +#include <xen/io/fbif.h> +#include <xen/io/kbdif.h> +#include <xen/io/protocols.h> + #ifndef BTN_LEFT #define BTN_LEFT 0x110 /* from <linux/input.h> */ #endif |