Merge commit 'v2.6.30-rc1' into perfcounters/core

Conflicts:
	arch/powerpc/include/asm/systbl.h
	arch/powerpc/include/asm/unistd.h
	include/linux/init_task.h

Merge reason: the conflicts are non-trivial: PowerPC placement
              of sys_perf_counter_open has to be mixed with the
	      new preadv/pwrite syscalls.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index 25d6f2341983..35ba2ae38b42 100644
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -334,7 +334,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
                 return rc;
         }
 
-        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 printk(KERN_WARNING "i2o: no suitable DMA found for %s\n",
                        pci_name(pdev));
                 rc = -ENODEV;
@@ -397,7 +397,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
                 }
 #ifdef CONFIG_I2O_EXT_ADAPTEC_DMA64
                 if (sizeof(dma_addr_t) > 4) {
-                        if (pci_set_dma_mask(pdev, DMA_64BIT_MASK))
+                        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64)))
                                 printk(KERN_INFO "%s: 64-bit DMA unavailable\n",
                                        c->name);
                         else {