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/fdc.h | |
| parent | a2da0395c12bd2b26e2180d735c83988ff66a559 (diff) | |
| parent | 653dbec7c97cb51d19636423902719e5850da265 (diff) | |
| download | focaccia-qemu-a4673e276248ada38f40d39191a197e7e35d3f8b.tar.gz focaccia-qemu-a4673e276248ada38f40d39191a197e7e35d3f8b.zip | |
Merge remote branch 'kwolf/for-anthony' into staging
Conflicts: hw/pc.c
Diffstat (limited to 'hw/fdc.h')
| -rw-r--r-- | hw/fdc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/fdc.h b/hw/fdc.h index c48b5e04df..b6b3772592 100644 --- a/hw/fdc.h +++ b/hw/fdc.h @@ -2,7 +2,7 @@ #define HW_FDC_H /* fdc.c */ -#include "sysemu.h" +#include "blockdev.h" #define MAX_FD 2 typedef struct FDCtrl FDCtrl; |