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, 1 insertions, 1 deletions

diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index a19dbccd7617..7a3a12d6e638 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -208,7 +208,7 @@ static int ide_pci_enable(struct pci_dev *dev, const struct ide_port_info *d)
          * a DMA mask field to the struct ide_port_info if we need it
          * (or let lower level driver set the DMA mask)
          */
-        ret = pci_set_dma_mask(dev, DMA_32BIT_MASK);
+        ret = pci_set_dma_mask(dev, DMA_BIT_MASK(32));
         if (ret < 0) {
                 printk(KERN_ERR "%s %s: can't set DMA mask\n",
                         d->name, pci_name(dev));