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/nand.c | |
| 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/nand.c')
| -rw-r--r-- | hw/nand.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/nand.c b/hw/nand.c index 40d5a6a736..cd7444f9a5 100644 --- a/hw/nand.c +++ b/hw/nand.c @@ -13,9 +13,8 @@ # include "hw.h" # include "flash.h" -# include "block.h" +# include "blockdev.h" /* FIXME: Pass block device as an argument. */ -# include "sysemu.h" # define NAND_CMD_READ0 0x00 # define NAND_CMD_READ1 0x01 |