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/scsi-generic.c | |
| parent | a2da0395c12bd2b26e2180d735c83988ff66a559 (diff) | |
| parent | 653dbec7c97cb51d19636423902719e5850da265 (diff) | |
Merge remote branch 'kwolf/for-anthony' into staging
Conflicts:
hw/pc.c
Diffstat (limited to 'hw/scsi-generic.c')
| -rw-r--r-- | hw/scsi-generic.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index c9aa853cc4..e31060e944 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -13,7 +13,6 @@ #include "qemu-common.h" #include "qemu-error.h" -#include "block.h" #include "scsi.h" #ifdef __linux__ |