diff -urpN -X linux-2.6.21-rc6/Documentation/dontdiff linux-2.6.21-rc6/drivers/spi/spi_s3c24xx.c linux-2.6.21-rc6-bjd1/drivers/spi/spi_s3c24xx.c
--- linux-2.6.21-rc6/drivers/spi/spi_s3c24xx.c	2007-04-09 10:08:06.000000000 +0100
+++ linux-2.6.21-rc6-bjd1/drivers/spi/spi_s3c24xx.c	2007-04-13 09:30:13.000000000 +0100
@@ -77,7 +77,7 @@ static void s3c24xx_spi_chipsel(struct s
 
 	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 s
 		/* 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;
 	}