Pull sony into release branch

[linux-2.6] / drivers / spi / spi_s3c24xx.c

diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 651379c51ae6b691bfd150d815ad5dbecbde77ba..b10211c420ef1640052892f2d8c686d6e80f442e 100644 (file)
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -41,7 +41,7 @@ struct s3c24xx_spi {
        int                      len;
        int                      count;
 
-       int                     (*set_cs)(struct s3c2410_spi_info *spi,
+       void                    (*set_cs)(struct s3c2410_spi_info *spi,
                                          int cs, int pol);
 
        /* data buffers */
@@ -77,7 +77,7 @@ static void s3c24xx_spi_chipsel(struct spi_device *spi, int value)
 
        switch (value) {
        case BITBANG_CS_INACTIVE:
-               hw->pdata->set_cs(hw->pdata, spi->chip_select, cspol^1);
+               hw->set_cs(hw->pdata, spi->chip_select, cspol^1);
                break;
 
        case BITBANG_CS_ACTIVE:
@@ -98,7 +98,7 @@ static void s3c24xx_spi_chipsel(struct spi_device *spi, int value)
                /* write new configration */
 
                writeb(spcon, hw->regs + S3C2410_SPCON);
-               hw->pdata->set_cs(hw->pdata, spi->chip_select, cspol);
+               hw->set_cs(hw->pdata, spi->chip_select, cspol);
 
                break;
        }