diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /drivers/ssb | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'drivers/ssb')
| -rw-r--r-- | drivers/ssb/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index 87ab2443e66d..0ffabf5c0b60 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c | |||
| @@ -471,6 +471,7 @@ static int ssb_devices_register(struct ssb_bus *bus) | |||
| 471 | #endif | 471 | #endif |
| 472 | break; | 472 | break; |
| 473 | case SSB_BUSTYPE_SSB: | 473 | case SSB_BUSTYPE_SSB: |
| 474 | dev->dma_mask = &dev->coherent_dma_mask; | ||
| 474 | break; | 475 | break; |
| 475 | } | 476 | } |
| 476 | 477 | ||