diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-14 13:32:23 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-14 13:32:30 +0400 |
| commit | 05cfbd66d07c44865983c8b65ae9d0037d874206 (patch) | |
| tree | 084b665cc97b47d1592fe76ea0a39a7753288a02 /drivers/net/atlx/atl1.c | |
| parent | 31c9a24ec82926fcae49483e53566d231e705057 (diff) | |
| parent | ef631b0ca01655d24e9ca7e199262c4a46416a26 (diff) | |
| download | linux-05cfbd66d07c44865983c8b65ae9d0037d874206.tar.xz | |
Merge branch 'core/urgent' into core/rcu
Merge reason: new patches to be queued up depend on:
ef631b0: rcu: Make hierarchical RCU less IPI-happy
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/atlx/atl1.c')
| -rw-r--r-- | drivers/net/atlx/atl1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 43fc1b2ca3cd..0ab22540bf59 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c @@ -2929,7 +2929,7 @@ static int __devinit atl1_probe(struct pci_dev *pdev, * various kernel subsystems to support the mechanics required by a * fixed-high-32-bit system. */ - err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); + err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); if (err) { dev_err(&pdev->dev, "no usable DMA configuration\n"); goto err_dma; |