Merge branch 'master' of /home/nchip/public_html/qemu into garage-push

[qemu] / hw / arm-misc.h

diff --git a/hw/arm-misc.h b/hw/arm-misc.h
index 5daac4f..367dd25 100644 (file)
--- a/hw/arm-misc.h
+++ b/hw/arm-misc.h
@@ -34,14 +34,8 @@ struct arm_boot_info {
 };
 void arm_load_kernel(CPUState *env, struct arm_boot_info *info);
 
-/* armv7m_nvic.c */
-
 /* Multiplication factor to convert from system clock ticks to qemu timer
    ticks.  */
 extern int system_clock_scale;
-qemu_irq *armv7m_nvic_init(CPUState *env);
-
-/* stellaris_enent.c */
-void stellaris_enet_init(NICInfo *nd, uint32_t base, qemu_irq irq);
 
 #endif /* !ARM_MISC_H */