diff options
| author |   Olof Johansson <olof@lixom.net> | 2013-01-28 13:37:09 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-28 13:37:09 -0800 |
| commit | 43243322139194c2fea606095f82498e07536c27 (patch) | |
| tree | aa434c6c8425c2279819d0fe72b2025eac1dc9f9 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |
| parent | Merge branch 'depends/cleanup' into next/drivers (diff) | |
| parent | dma: coh901318: cut down on platform data abstraction (diff) | |
| download | linux-dev-43243322139194c2fea606095f82498e07536c27.tar.xz linux-dev-43243322139194c2fea606095f82498e07536c27.zip | |
Merge tag 'coh901318-for-arm-soc' of http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/drivers
This pushes the platform data for the U300 COH901318
DMA controller down into the driver and cleans up in
the <mach/*> namespace for the U300 platform.
* tag 'coh901318-for-arm-soc' of http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
dma: coh901318: cut down on platform data abstraction
dma: coh901318: merge header files
dma: coh901318: push definitions into driver
dma: coh901318: push header down into the DMA subsystem
dma: coh901318: skip hard-coded addresses
dma: coh901318: remove hardcoded target addresses
dma: coh901318: push platform data into driver
dma: coh901318: create a proper platform data file
Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
arch/arm/mach-u300/core.c
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c')
0 files changed, 0 insertions, 0 deletions