diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 16:23:15 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 16:23:21 +0000 |
| commit | a173fc693b25216c5c834978f4fafd731fd4ff94 (patch) | |
| tree | f75c2fa106217cc3afd1bde6803ca77fe953bbcf /arch/arm/mach-shmobile/setup-sh7372.c | |
| parent | d052e161c4067cf21daacb1de960a1e449babfe4 (diff) | |
| parent | 759a45185ac0e4dfaf8bbfcb390ec73aca4b7a34 (diff) | |
Merge branch 'kirkwood/board' into next/boards
* kirkwood/board: (2 commits)
ARM: kirkwood: convert uart0 to devicetree.
ARM: kirkwood: add dreamplug (fdt) support.
Series sent by email from Jason Cooper <jason@lakedaemon.net>
Update to Linux 3.3-rc3
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-shmobile/setup-sh7372.c')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-sh7372.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c index 6fcf304d3cd..a83cf51fc09 100644 --- a/arch/arm/mach-shmobile/setup-sh7372.c +++ b/arch/arm/mach-shmobile/setup-sh7372.c @@ -662,6 +662,7 @@ static struct sh_dmae_pdata usb_dma0_platform_data = { .dmaor_is_32bit = 1, .needs_tend_set = 1, .no_dmars = 1, + .slave_only = 1, }; static struct resource sh7372_usb_dmae0_resources[] = { @@ -723,6 +724,7 @@ static struct sh_dmae_pdata usb_dma1_platform_data = { .dmaor_is_32bit = 1, .needs_tend_set = 1, .no_dmars = 1, + .slave_only = 1, }; static struct resource sh7372_usb_dmae1_resources[] = { |