a pxa2xx fixup patch for .26

diff --git a/review-2.6.26/pxa2xx_spi-fix-build-breakage.patch b/review-2.6.26/pxa2xx_spi-fix-build-breakage.patch
new file mode 100644 (file)
index 0000000..2a34a8f
--- /dev/null
+++ b/review-2.6.26/pxa2xx_spi-fix-build-breakage.patch
@@ -0,0 +1,53 @@
+From 20b918dc77b383e9779dafceee3f2198a6f7b0e5 Mon Sep 17 00:00:00 2001
+From: Mike Rapoport <mike@compulab.co.il>
+Date: Wed, 1 Oct 2008 10:39:24 -0700
+Subject: pxa2xx_spi: fix build breakage
+
+From: Mike Rapoport <mike@compulab.co.il>
+
+commit 20b918dc77b383e9779dafceee3f2198a6f7b0e5 upstream
+
+This patch fixes a build error in the pxa2xx-spi driver,
+introduced by commit 7e96445533ac3f4f7964646a202ff3620602fab4
+("pxa2xx_spi: dma bugfixes")
+
+  CC      drivers/spi/pxa2xx_spi.o
+drivers/spi/pxa2xx_spi.c: In function 'map_dma_buffers':
+drivers/spi/pxa2xx_spi.c:331: error: invalid operands to binary &
+drivers/spi/pxa2xx_spi.c:331: error: invalid operands to binary &
+drivers/spi/pxa2xx_spi.c: In function 'pump_transfers':
+drivers/spi/pxa2xx_spi.c:897: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'unsigned int'
+
+[dbrownell@users.sourceforge.net: fix warning too ]
+
+Signed-off-by: Mike Rapoport <mike@compulab.co.il>
+Acked-by: Eric Miao <eric.miao@marvell.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/spi/pxa2xx_spi.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/spi/pxa2xx_spi.c
++++ b/drivers/spi/pxa2xx_spi.c
+@@ -50,7 +50,7 @@ MODULE_ALIAS("platform:pxa2xx-spi");
+ 
+ #define DMA_INT_MASK          (DCSR_ENDINTR | DCSR_STARTINTR | DCSR_BUSERR)
+ #define RESET_DMA_CHANNEL     (DCSR_NODESC | DMA_INT_MASK)
+-#define IS_DMA_ALIGNED(x)     (((x) & 0x07) == 0)
++#define IS_DMA_ALIGNED(x)     ((((u32)(x)) & 0x07) == 0)
+ #define MAX_DMA_LEN           8191
+ 
+ /*
+@@ -897,7 +897,7 @@ static void pump_transfers(unsigned long
+                               || transfer->rx_dma || transfer->tx_dma) {
+                       dev_err(&drv_data->pdev->dev,
+                               "pump_transfers: mapped transfer length "
+-                              "of %lu is greater than %d\n",
++                              "of %u is greater than %d\n",
+                               transfer->len, MAX_DMA_LEN);
+                       message->status = -EINVAL;
+                       giveback(drv_data);

diff --git a/review-2.6.26/series b/review-2.6.26/series
index f718a29d435c8af2152e94c1bbfe620af2834079..4586a1d963dc0b9a094dea3c0232e9c527a27505 100644 (file)
--- a/review-2.6.26/series
+++ b/review-2.6.26/series
@@ -7,6 +7,7 @@ async_tx-fix-the-bug-in-async_tx_run_dependencies.patch
 mm-mark-the-correct-zone-as-full-when-scanning-zonelists.patch
 pxa2xx_spi-dma-bugfixes.patch
 pxa2xx_spi-chipselect-bugfixes.patch
+pxa2xx_spi-fix-build-breakage.patch
 smb.h-do-not-include-linux-time.h-in-userspace.patch
 usb-fix-hcd-interrupt-disabling.patch
 scsi-qla2xxx-defer-enablement-of-risc-interrupts-until-isp-initialization-completes.patch