From c345372503c3ff8145c08ae6836cfb868b7063d8 Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Wed, 28 Nov 2007 16:21:10 -0800
Subject: [PATCH] --- yaml --- r: 74342 b: refs/heads/master c:
 65f97a56944b797f5df714d677b541cca0829669 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/spi/atmel_spi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9ee38dbcdde8..0b21fa739582 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8905a67c63ff3facadad10aa53a8bb159f3ace7b
+refs/heads/master: 65f97a56944b797f5df714d677b541cca0829669
diff --git a/trunk/drivers/spi/atmel_spi.c b/trunk/drivers/spi/atmel_spi.c
index 0d342dcdd302..ff6a14bf1280 100644
--- a/trunk/drivers/spi/atmel_spi.c
+++ b/trunk/drivers/spi/atmel_spi.c
@@ -497,7 +497,7 @@ static int atmel_spi_setup(struct spi_device *spi)
 	/* chipselect must have been muxed as GPIO (e.g. in board setup) */
 	npcs_pin = (unsigned int)spi->controller_data;
 	if (!spi->controller_state) {
-		ret = gpio_request(npcs_pin, "spi_npcs");
+		ret = gpio_request(npcs_pin, spi->dev.bus_id);
 		if (ret)
 			return ret;
 		spi->controller_state = (void *)npcs_pin;