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

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 21964aaebca..280261c451d 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -1402,13 +1402,13 @@ int aac_get_adapter_info(struct aac_dev* dev)
         }
 
         if(dev->dac_support != 0) {
-                if (!pci_set_dma_mask(dev->pdev, DMA_64BIT_MASK) &&
-                        !pci_set_consistent_dma_mask(dev->pdev, DMA_64BIT_MASK)) {
+                if (!pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(64)) &&
+                        !pci_set_consistent_dma_mask(dev->pdev, DMA_BIT_MASK(64))) {
                         if (!dev->in_reset)
                                 printk(KERN_INFO"%s%d: 64 Bit DAC enabled\n",
                                         dev->name, dev->id);
-                } else if (!pci_set_dma_mask(dev->pdev, DMA_32BIT_MASK) &&
-                        !pci_set_consistent_dma_mask(dev->pdev, DMA_32BIT_MASK)) {
+                } else if (!pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(32)) &&
+                        !pci_set_consistent_dma_mask(dev->pdev, DMA_BIT_MASK(32))) {
                         printk(KERN_INFO"%s%d: DMA mask set failed, 64 Bit DAC disabled\n",
                                 dev->name, dev->id);
                         dev->dac_support = 0;