diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-27 12:42:48 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-27 12:42:48 +0000 |
commit | f412b09f4ed7c57f5b8935ed7d6fc786f402a629 (patch) | |
tree | 34fe1b4b64db4993e9fb21a70812fafed0437870 /arch/arm/kernel/thumbee.c | |
parent | 31bccbf39208133415000520c79ebe7b291786df (diff) | |
parent | 7f1fd31db158c95418d9cc5690ab60ecc6fb632d (diff) | |
download | kernel_goldelico_gta04-f412b09f4ed7c57f5b8935ed7d6fc786f402a629.zip kernel_goldelico_gta04-f412b09f4ed7c57f5b8935ed7d6fc786f402a629.tar.gz kernel_goldelico_gta04-f412b09f4ed7c57f5b8935ed7d6fc786f402a629.tar.bz2 |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel
Diffstat (limited to 'arch/arm/kernel/thumbee.c')
-rw-r--r-- | arch/arm/kernel/thumbee.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/thumbee.c b/arch/arm/kernel/thumbee.c index df3f6b7..9cb7aac 100644 --- a/arch/arm/kernel/thumbee.c +++ b/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)); |