Merge branch 'lpc32xx/core-fixes' of git://git.antcom.de/linux-2.6 into next/soc

Browse source

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 all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

arch/arm/mach-lpc32xx/phy3250.c

View file