hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Arnd Bergmann 2012-07-12 14:44:35 +02:00
parent 04cf794165 8ba85f8bff
commit 478e1a141c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-lpc32xx/phy3250.c
View File

@ -186,13 +186,12 @@ static struct pl08x_channel_data pl08x_slave_channels[] = {
}, },
}; };
/* NOTE: These will change, according to RMK */ static int pl08x_get_signal(const struct pl08x_channel_data *cd)
static int pl08x_get_signal(struct pl08x_dma_chan *ch)
{ {
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)
{ {
} }