diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 08:31:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 08:31:52 -0700 |
| commit | 0f873d5fb68a6aea9519c9cd613ddf4e7e2378d4 (patch) | |
| tree | 92f98ce0951cb5eec91490fb1ad9e5b0ffe7ca63 /drivers | |
| parent | df45eddc60e1ab4c81b61e240271eabb4fb176e8 (diff) | |
| parent | ac82da3381fc663dbda31612a0bff60bc41676a3 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[SSB] Initialise dma_mask for SSB_BUSTYPE_SSB devices
[MIPS] BCM47xx: Fix build error due to missing PCI functions
[MIPS] IP27: Switch to dynamic interrupt routing avoding panic on error.
[MIPS] au1000: Make sure GPIO value is zero or one
Diffstat (limited to 'drivers')
| -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) #endif break; case SSB_BUSTYPE_SSB: + dev->dma_mask = &dev->coherent_dma_mask; break; } |