summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-29 08:31:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-29 08:31:52 -0700
commit0f873d5fb68a6aea9519c9cd613ddf4e7e2378d4 (patch)
tree92f98ce0951cb5eec91490fb1ad9e5b0ffe7ca63 /drivers
parentdf45eddc60e1ab4c81b61e240271eabb4fb176e8 (diff)
parentac82da3381fc663dbda31612a0bff60bc41676a3 (diff)
downloadop-kernel-dev-0f873d5fb68a6aea9519c9cd613ddf4e7e2378d4.zip
op-kernel-dev-0f873d5fb68a6aea9519c9cd613ddf4e7e2378d4.tar.gz
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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index 87ab244..0ffabf5 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;
}
OpenPOWER on IntegriCloud