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/omap_sx1.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/omap_sx1.c')
| -rw-r--r-- | hw/omap_sx1.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c index 06bccbdc4e..a7b687bc41 100644 --- a/hw/omap_sx1.c +++ b/hw/omap_sx1.c @@ -26,7 +26,6 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "hw.h" -#include "sysemu.h" #include "console.h" #include "omap.h" #include "boards.h" |