some .25 fixes based on the review cycle

diff --git a/review-2.6.25/alsa-hda-fix-model-for-dell-inspiron-1525.patch b/review-2.6.25/alsa-hda-fix-model-for-dell-inspiron-1525.patch
deleted file mode 100644 (file)
index 5ed238c..0000000
--- a/review-2.6.25/alsa-hda-fix-model-for-dell-inspiron-1525.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From jejb@kernel.org  Tue Sep 30 14:38:32 2008
-From: Takashi Iwai <tiwai@suse.de>
-Date: Tue, 30 Sep 2008 18:15:10 GMT
-Subject: ALSA: hda - Fix model for Dell Inspiron 1525
-To: jejb@kernel.org, stable@kernel.org
-Message-ID: <200809301815.m8UIFA86018882@hera.kernel.org>
-
-From: Takashi Iwai <tiwai@suse.de>
-
-commit 24918b61b55c21e09a3e07cd82e1b3a8154782dc upstream
-
-Dell Inspiron 1525 seems to have a buggy BIOS setup and screws up
-the recent codec parser, as reported by Oleksandr Natalenko:
-    http://lkml.org/lkml/2008/9/12/203
-
-This patch adds the working model, dell-3stack, statically.
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- sound/pci/hda/patch_sigmatel.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/sound/pci/hda/patch_sigmatel.c
-+++ b/sound/pci/hda/patch_sigmatel.c
-@@ -1541,8 +1541,8 @@ static struct snd_pci_quirk stac927x_cfg
-       /* Dell 3 stack systems with verb table in BIOS */
-       SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01f3, "Dell Inspiron 1420", STAC_DELL_BIOS),
-       SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0227, "Dell Vostro 1400  ", STAC_DELL_BIOS),
--      SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x022f, "Dell     ", STAC_DELL_BIOS),
-       SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x022e, "Dell     ", STAC_DELL_BIOS),
-+      SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x022f, "Dell Inspiron 1525", STAC_DELL_3ST),
-       SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0242, "Dell     ", STAC_DELL_BIOS),
-       SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0243, "Dell     ", STAC_DELL_BIOS),
-       SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x02ff, "Dell     ", STAC_DELL_BIOS),

diff --git a/review-2.6.25/pxa2xx_spi-fix-build-breakage.patch b/review-2.6.25/pxa2xx_spi-fix-build-breakage.patch
new file mode 100644 (file)
index 0000000..a8f280d
--- /dev/null
+++ b/review-2.6.25/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
+ 
+ /*
+@@ -893,7 +893,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.25/series b/review-2.6.25/series
index 250a662c1d53f1730dcce6cc44c70d2bf0664a1f..66c086c1bf7f10513cbfafab5be6c66c230130a0 100644 (file)
--- a/review-2.6.25/series
+++ b/review-2.6.25/series
@@ -1,8 +1,8 @@
 usb-fix-hcd-interrupt-disabling.patch
 pxa2xx_spi-dma-bugfixes.patch
 pxa2xx_spi-chipselect-bugfixes.patch
+pxa2xx_spi-fix-build-breakage.patch
 drivers-mmc-card-block.c-fix-refcount-leak-in-mmc_block_open.patch
-alsa-hda-fix-model-for-dell-inspiron-1525.patch
 i2c-dev-return-correct-error-code-on-class_create-failure.patch
 acpi-fix-thermal-shutdowns.patch
 x86-add-io-delay-quirk-for-presario-f700.patch