Fix some warnings that would be generated by gcc -Wredundant-decls

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5115 c046a42c-6fe2-441c-8c8c-71466251a162

4 files changed, 6 insertions, 6 deletions

diff --git a/hw/arm-misc.h b/hw/arm-misc.h
index 3660772dbc..f118edb3bd 100644
--- a/hw/arm-misc.h
+++ b/hw/arm-misc.h
@@ -34,6 +34,9 @@ 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.  */
 int system_clock_scale;
 qemu_irq *armv7m_nvic_init(CPUState *env);
 
diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c
index 26e4c2f2fd..c55c958718 100644
--- a/hw/armv7m_nvic.c
+++ b/hw/armv7m_nvic.c
@@ -50,10 +50,6 @@ typedef struct {
 #define SYSTICK_CLKSOURCE (1 << 2)
 #define SYSTICK_COUNTFLAG (1 << 16)
 
-/* Multiplication factor to convert from system clock ticks to qemu timer
-   ticks.  */
-int system_clock_scale;
-
 /* Conversion factor from qemu timer to SysTick frequencies.  */
 static inline int64_t systick_scale(nvic_state *s)
 {
diff --git a/hw/isa.h b/hw/isa.h
index 89b3004a53..222e4f347b 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -1,3 +1,5 @@
+#ifndef HW_ISA_H
+#define HW_ISA_H
 /* ISA bus */
 
 extern target_phys_addr_t isa_mem_base;
@@ -22,3 +24,4 @@ void DMA_init (int high_page_enable);
 void DMA_register_channel (int nchan,
                            DMA_transfer_handler transfer_handler,
                            void *opaque);
+#endif
diff --git a/hw/usb.h b/hw/usb.h
index 55b7e5850a..997e69fa0e 100644
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -235,8 +235,6 @@ int usb_generic_handle_packet(USBDevice *s, USBPacket *p);
 int set_usb_string(uint8_t *buf, const char *str);
 void usb_send_msg(USBDevice *dev, int msg);
 
-void usb_packet_complete(USBPacket *p);
-
 /* usb hub */
 USBDevice *usb_hub_init(int nb_ports);