summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-06-15 00:08:20 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-06-15 00:08:20 +0000
commit6ea3973b80ccabbe02a4c1aaa52a4f8c9939529a (patch)
treee7579485c840ef10bd23fde6cc6b5d99f0750013 /target
parent6e49fbcfc04d163bbaa235e9fdeef782f95ec1c5 (diff)
goldfish: fix clocksource api mismatch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16465 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/goldfish/patches-2.6.30/0118--ARM-goldfish-Add-goldfish-platform.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/goldfish/patches-2.6.30/0118--ARM-goldfish-Add-goldfish-platform.patch b/target/linux/goldfish/patches-2.6.30/0118--ARM-goldfish-Add-goldfish-platform.patch
index 21e6716d8..c05c78230 100644
--- a/target/linux/goldfish/patches-2.6.30/0118--ARM-goldfish-Add-goldfish-platform.patch
+++ b/target/linux/goldfish/patches-2.6.30/0118--ARM-goldfish-Add-goldfish-platform.patch
@@ -2018,7 +2018,7 @@ Signed-off-by: Arve Hjønnevåg <arve@android.com>
+ return IRQ_HANDLED;
+}
+
-+static cycle_t goldfish_timer_read(void)
++static cycle_t goldfish_timer_read(struct clocksource *cs)
+{
+ uint32_t timer_base = IO_ADDRESS(GOLDFISH_TIMER_BASE);
+ unsigned long irqflags;