diff options
| author | Michael S. Tsirkin | 2011-05-05 15:39:47 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2011-05-05 15:39:47 +0200 |
| commit | 5300f1a5487f67f0bde8ee1081b799108668cb1d (patch) | |
| tree | 5274ff496f2665487736a4eec23bf76601e4da44 /hw/xilinx_timer.c | |
| parent | CPUPhysMemoryClient: Pass guest physical address not region offset (diff) | |
| parent | NBD: Avoid leaking a couple of strings when the NBD device is closed (diff) | |
| download | qemu-5300f1a5487f67f0bde8ee1081b799108668cb1d.tar.gz qemu-5300f1a5487f67f0bde8ee1081b799108668cb1d.tar.xz qemu-5300f1a5487f67f0bde8ee1081b799108668cb1d.zip | |
Merge remote branch 'origin/master' into pci
Conflicts:
exec.c
Diffstat (limited to 'hw/xilinx_timer.c')
| -rw-r--r-- | hw/xilinx_timer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c index 30827b03cd..d398c18e9e 100644 --- a/hw/xilinx_timer.c +++ b/hw/xilinx_timer.c @@ -23,7 +23,6 @@ */ #include "sysbus.h" -#include "sysemu.h" #include "qemu-timer.h" #define D(x) |