Revert "Merge remote-tracking branch 'qemu-kvm/memory/batch' into staging"

[mirror_qemu.git] / hw / arm-misc.h

diff --git a/hw/arm-misc.h b/hw/arm-misc.h
index af403a159a3c5547d49c41d9ddc998dcf44a612f..f8a747289b9c9cd624890be4aa57462ef1699a22 100644 (file)
--- a/hw/arm-misc.h
+++ b/hw/arm-misc.h
@@ -11,16 +11,13 @@
 #ifndef ARM_MISC_H
 #define ARM_MISC_H 1
 
-#include "memory.h"
-
 /* The CPU is also modeled as an interrupt controller.  */
 #define ARM_PIC_CPU_IRQ 0
 #define ARM_PIC_CPU_FIQ 1
 qemu_irq *arm_pic_init_cpu(CPUState *env);
 
 /* armv7m.c */
-qemu_irq *armv7m_init(MemoryRegion *address_space_mem,
-                      int flash_size, int sram_size,
+qemu_irq *armv7m_init(int flash_size, int sram_size,
                       const char *kernel_filename, const char *cpu_model);
 
 /* arm_boot.c */