Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

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

diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 651379c51ae6b691bfd150d815ad5dbecbde77ba..220abce63e4abd12a0b9a3d620265d3caf698b0c 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 */