diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2012-07-12 14:44:35 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 14:44:35 +0200 |
| commit | 478e1a141c6c5d6c060ff0af9dfcf88aa6f59ac3 (patch) | |
| tree | 98ea95ded39a957838910c6cdf9859429fec4064 | |
| parent | Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc (diff) | |
| parent | ARM: LPC32xx: Adjust to pl08x DMA interface changes (diff) | |
| download | linux-dev-478e1a141c6c5d6c060ff0af9dfcf88aa6f59ac3.tar.xz linux-dev-478e1a141c6c5d6c060ff0af9dfcf88aa6f59ac3.zip | |
Merge branch 'lpc32xx/core-fixes' of git://git.antcom.de/linux-2.6 into next/soc
From Roland Stigge <stigge@antcom.de>:
This is the pull request including the fix for the compile error caused
by lpc32xx-next and dma branches collisions in linux-next.
* 'lpc32xx/core-fixes' of git://git.antcom.de/linux-2.6:
ARM: LPC32xx: Adjust to pl08x DMA interface changes
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-lpc32xx/phy3250.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c index 8625237ce656..b07dcc90829d 100644 --- a/arch/arm/mach-lpc32xx/phy3250.c +++ b/arch/arm/mach-lpc32xx/phy3250.c @@ -186,13 +186,12 @@ static struct pl08x_channel_data pl08x_slave_channels[] = { }, }; -/* NOTE: These will change, according to RMK */ -static int pl08x_get_signal(struct pl08x_dma_chan *ch) +static int pl08x_get_signal(const struct pl08x_channel_data *cd) { - return ch->cd->min_signal; + return cd->min_signal; } -static void pl08x_put_signal(struct pl08x_dma_chan *ch) +static void pl08x_put_signal(const struct pl08x_channel_data *cd, int ch) { } |