From 500cbd0dd907b571ec54c056423182f571ff1634 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Mon, 10 Nov 2008 14:14:11 +0000
Subject: [PATCH] --- yaml --- r: 123557 b: refs/heads/master c:
 7f1fd31db158c95418d9cc5690ab60ecc6fb632d h: refs/heads/master i:   123555:
 e3fce3afaab9a68e0d23edd68e9ff87fe83a7ee5 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/kernel/thumbee.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b905b07d4545..64c38c397991 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8553cb67d2318db327071018fc81084cbabccc46
+refs/heads/master: 7f1fd31db158c95418d9cc5690ab60ecc6fb632d
diff --git a/trunk/arch/arm/kernel/thumbee.c b/trunk/arch/arm/kernel/thumbee.c
index df3f6b7ebcea..9cb7aaca159f 100644
--- a/trunk/arch/arm/kernel/thumbee.c
+++ b/trunk/arch/arm/kernel/thumbee.c
@@ -25,7 +25,7 @@
 /*
  * Access to the ThumbEE Handler Base register
  */
-static inline unsigned long teehbr_read()
+static inline unsigned long teehbr_read(void)
 {
 	unsigned long v;
 	asm("mrc	p14, 6, %0, c1, c0, 0\n" : "=r" (v));