diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-06-14 10:33:36 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-06-14 10:33:36 -0500 |
| commit | a4673e276248ada38f40d39191a197e7e35d3f8b (patch) | |
| tree | 4ecdac95fb7bb86eefc08ee38ca229c4d89e02e0 /hw/pc.c | |
| parent | a2da0395c12bd2b26e2180d735c83988ff66a559 (diff) | |
| parent | 653dbec7c97cb51d19636423902719e5850da265 (diff) | |
| download | qemu-a4673e276248ada38f40d39191a197e7e35d3f8b.zip qemu-a4673e276248ada38f40d39191a197e7e35d3f8b.tar.gz qemu-a4673e276248ada38f40d39191a197e7e35d3f8b.tar.bz2 | |
Merge remote branch 'kwolf/for-anthony' into staging
Conflicts:
hw/pc.c
Diffstat (limited to 'hw/pc.c')
| -rw-r--r-- | hw/pc.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -36,6 +36,7 @@ #include "multiboot.h" #include "mc146818rtc.h" #include "sysbus.h" +#include "sysemu.h" /* output Bochs bios info messages */ //#define DEBUG_BIOS |