- spi-controller-driver-for-omap-microwire-update.patch removed from -mm tree

- spi-controller-driver-for-omap-microwire-update.patch removed from -mm tree

[akpm]

The patch titled
     SPI controller driver for OMAP Microwire (update)
has been removed from the -mm tree.  Its filename was
     spi-controller-driver-for-omap-microwire-update.patch

This patch was dropped because it was folded into spi-controller-driver-for-omap-microwire.patch

------------------------------------------------------
Subject: SPI controller driver for OMAP Microwire (update)
From: David Brownell <david-b@pacbell.net>



Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/spi/omap_uwire.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff -puN drivers/spi/omap_uwire.c~spi-controller-driver-for-omap-microwire-update drivers/spi/omap_uwire.c
--- a/drivers/spi/omap_uwire.c~spi-controller-driver-for-omap-microwire-update
+++ a/drivers/spi/omap_uwire.c
@@ -6,7 +6,7 @@
  * Ported to 2.6 OMAP uwire interface.
  * Copyright (C) 2004 Texas Instruments.
  *
- * Generalization patches by Juha Yrjölä <juha.yrjola@nokia.com>
+ * Generalization patches by Juha Yrjölä <juha.yrjola@nokia.com>
  *
  * Copyright (C) 2005 David Brownell (ported to 2.6 SPI interface)
  * Copyright (C) 2006 Nokia
@@ -403,8 +403,8 @@ static int uwire_setup_transfer(struct s
 	if (div1_idx == 4) {
 		pr_debug("%s: lowest clock %ld, need %d\n",
 			spi->dev.bus_id, rate / 10 / 8, hz);
-		status = -EDOM;
-		goto done;
+			status = -EDOM;
+			goto done;
 	}
 
 	/* we have to cache this and reset in uwire_chipselect as this is a
@@ -480,7 +480,7 @@ static int uwire_probe(struct platform_d
 
 	master = spi_alloc_master(&pdev->dev, sizeof *uwire);
 	if (!master)
-		return -ENOMEM;
+		return -ENODEV;
 
 	uwire = spi_master_get_devdata(master);
 	dev_set_drvdata(&pdev->dev, uwire);
_

Patches currently in -mm which might be from david-b@pacbell.net are

origin.patch
spi-kconfig-fix.patch
spi-controller-driver-for-omap-microwire.patch
spi-controller-driver-for-omap-microwire-update.patch
spi-controller-driver-for-omap-microwire-update-fix.patch
spi-freescale-imx-spi-controller-driver-v5.patch
spi-doc-clarifications.patch
rtc-gets-sysfs-wakealarm-attribute.patch
spi-eeprom-driver.patch
spi-eeprom-driver-cleanups.patch
gpio-core.patch
omap-gpio-wrappers.patch
at91-gpio-wrappers.patch