diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-10 06:46:28 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-10 06:46:51 -0400 |
| commit | 1cad1252ed279ea59f3f8d3d3a5817eeb2f7a4d3 (patch) | |
| tree | ec5af7a70f58ad27ad21fc27815ca164ccf92c36 /drivers/net/sc92031.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/sc92031.c')
| -rw-r--r-- | drivers/net/sc92031.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c index c13cbf099b88..18821f217e19 100644 --- a/drivers/net/sc92031.c +++ b/drivers/net/sc92031.c | |||
| @@ -1427,11 +1427,11 @@ static int __devinit sc92031_probe(struct pci_dev *pdev, | |||
| 1427 | 1427 | ||
| 1428 | pci_set_master(pdev); | 1428 | pci_set_master(pdev); |
| 1429 | 1429 | ||
| 1430 | err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); | 1430 | err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); |
| 1431 | if (unlikely(err < 0)) | 1431 | if (unlikely(err < 0)) |
| 1432 | goto out_set_dma_mask; | 1432 | goto out_set_dma_mask; |
| 1433 | 1433 | ||
| 1434 | err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); | 1434 | err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); |
| 1435 | if (unlikely(err < 0)) | 1435 | if (unlikely(err < 0)) |
| 1436 | goto out_set_dma_mask; | 1436 | goto out_set_dma_mask; |
| 1437 | 1437 | ||