ramips: request_irq prior to dma allocation, and handle the case if it fails

[openwrt.git] / target / linux / goldfish / patches-2.6.30 / 0118--ARM-goldfish-Add-goldfish-platform.patch

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 21e6716..c05c782 100644 (file)
--- 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;