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>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 221b0c4c824a..d531614a90b5 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1973,9 +1973,9 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev,
 
         /* See if we can set the dma mask early on; failure is fatal. */
         if (sizeof(dma_addr_t) == 8 &&
-                !pci_set_dma_mask(pci_dev, DMA_64BIT_MASK)) {
+                !pci_set_dma_mask(pci_dev, DMA_BIT_MASK(64))) {
                 using_dac = 1;
-        } else if (!pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) {
+        } else if (!pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32))) {
                 using_dac = 0;
         } else {
                 dev_warn(&pci_dev->dev, "pci_set_dma_mask failed!\n");