Merge remote-tracking branches 'spi/topic/drivers', 'spi/topic/dw', 'spi/topic/efm32...

[linux-2.6-block.git] / drivers / spi / spi-gpio.c

diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index b189b958432b960adb8fe4a24c8310686073af80..e97baf2f475c9ba6c8bbf3682bc9624833a3d8fc 100644 (file)
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -250,7 +250,7 @@ static int spi_gpio_setup(struct spi_device *spi)
                /*
                 * ... otherwise, take it from spi->controller_data
                 */
-               cs = (unsigned int) spi->controller_data;
+               cs = (unsigned int)(uintptr_t) spi->controller_data;
        }
 
        if (!spi->controller_state) {