diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-10 12:46:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-10 12:46:51 +0200 |
| commit | 1cad1252ed279ea59f3f8d3d3a5817eeb2f7a4d3 (patch) | |
| tree | ec5af7a70f58ad27ad21fc27815ca164ccf92c36 /drivers/net/tokenring/lanstreamer.c | |
| parent | dcef788eb9659b61a2110284fcce3ca6e63480d2 (diff) | |
| parent | 93cfb3c9fd83d877a8f1ffad9ff862b617b32828 (diff) | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: pick up both v2.6.30-rc1 [which includes tracing/urgent fixes]
and pick up the current lineup of tracing/urgent fixes as well
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/tokenring/lanstreamer.c')
| -rw-r--r-- | drivers/net/tokenring/lanstreamer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index f309b8f703bd..2e70ee8f1459 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c @@ -267,7 +267,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev, #endif #endif - rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); + rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); if (rc) { printk(KERN_ERR "%s: No suitable PCI mapping available.\n", dev->name); |