diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-01 15:12:56 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-01 15:12:56 +0200 |
| commit | b262e60309e1b0eb25d300c7e739427d5316abb1 (patch) | |
| tree | bf319d78c79bb5cb617ff0c8340c73aa349bba15 /drivers/ssb | |
| parent | ipv6: almost identical frag hashing funcs combined (diff) | |
| parent | af_key: Free dumping state on socket close (diff) | |
| download | linux-b262e60309e1b0eb25d300c7e739427d5316abb1.tar.xz linux-b262e60309e1b0eb25d300c7e739427d5316abb1.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath9k/core.c
drivers/net/wireless/ath9k/main.c
net/core/dev.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) #endif break; case SSB_BUSTYPE_SSB: + dev->dma_mask = &dev->coherent_dma_mask; break; } |