aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-06-15 00:08:20 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-06-15 00:08:20 +0000
commit828fd68e007f2217198198ef8a8a77c0760ca9e1 (patch)
tree6f1447ff3771ff48036c0c6d63e2a20fd042efea /target/linux
parentfc4fe835742969cbcf210224fe1ae1f8611e1002 (diff)
downloadupstream-828fd68e007f2217198198ef8a8a77c0760ca9e1.tar.gz
upstream-828fd68e007f2217198198ef8a8a77c0760ca9e1.tar.bz2
upstream-828fd68e007f2217198198ef8a8a77c0760ca9e1.zip
goldfish: fix clocksource api mismatch
SVN-Revision: 16465
Diffstat (limited to 'target/linux')
-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 21e6716d80..c05c782308 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;