| commit | 01244812dc8b26b2b14fbb16d2813485d1e15b31 | |
| author | Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com> | |
| Mon, 10 Nov 2008 09:34:52 +0000 (10 10:34 +0100) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Mon, 10 Nov 2008 09:46:30 +0000 (10 11:46 +0200) | ||
| tree | fff58354977e239e0b7877644e0afbf7c7e5ec05 | treesnapshot (tar.gz zip) |
| parent | 29419413070920758f95e20b73c9571fdae1badf | commitdiff |
Fix io.h include merge confilict
The ioperm() call was moved to x86 specific code, so no need to include io.h.
Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
The ioperm() call was moved to x86 specific code, so no need to include io.h.
Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
| qemu-kvm.c | diffblobblamehistory |