diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-17 00:53:53 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-17 00:53:53 +0300 |
| commit | c15cb37cc4e9809624411333b96109ddf770e29c (patch) | |
| tree | 3d4dbb48d97d5df9096ad815b99b20660cdc1bbf /drivers/spi/spi_s3c24xx_gpio.c | |
| parent | 77be80e437fec44f8b7a620314b7d7b605b8d93b (diff) | |
| parent | 8b1fae4e4200388b64dd88065639413cb3f1051c (diff) | |
| download | linux-c15cb37cc4e9809624411333b96109ddf770e29c.tar.xz | |
Merge commit 'v2.6.28-rc8' into x86/uv
Diffstat (limited to 'drivers/spi/spi_s3c24xx_gpio.c')
| -rw-r--r-- | drivers/spi/spi_s3c24xx_gpio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c index cc1f647f579b..f2447a5476bb 100644 --- a/drivers/spi/spi_s3c24xx_gpio.c +++ b/drivers/spi/spi_s3c24xx_gpio.c @@ -34,7 +34,7 @@ struct s3c2410_spigpio { static inline struct s3c2410_spigpio *spidev_to_sg(struct spi_device *spi) { - return spi->controller_data; + return spi_master_get_devdata(spi->master); } static inline void setsck(struct spi_device *dev, int on) @@ -118,6 +118,7 @@ static int s3c2410_spigpio_probe(struct platform_device *dev) /* setup spi bitbang adaptor */ sp->bitbang.master = spi_master_get(master); sp->bitbang.master->bus_num = info->bus_num; + sp->bitbang.master->num_chipselect = info->num_chipselect; sp->bitbang.chipselect = s3c2410_spigpio_chipselect; sp->bitbang.txrx_word[SPI_MODE_0] = s3c2410_spigpio_txrx_mode0; |