Add statics and missing #includes for prototypes.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/hw/arm_timer.c b/hw/arm_timer.c
index 417d53db84..540d3dea1b 100644
--- a/hw/arm_timer.c
+++ b/hw/arm_timer.c
@@ -8,8 +8,8 @@
  */
 
 #include "hw.h"
-#include "arm-misc.h"
 #include "qemu-timer.h"
+#include "primecell.h"
 
 /* Common timer implementation.  */
 
@@ -43,7 +43,7 @@ static void arm_timer_update(arm_timer_state *s)
     }
 }
 
-uint32_t arm_timer_read(void *opaque, target_phys_addr_t offset)
+static uint32_t arm_timer_read(void *opaque, target_phys_addr_t offset)
 {
     arm_timer_state *s = (arm_timer_state *)opaque;