diff -urpN -X ../dontdiff linux-2.6.17-rc5/drivers/spi/spi_s3c24xx.c linux-2.6.17-rc5-axparport/drivers/spi/spi_s3c24xx.c
--- linux-2.6.17-rc5/drivers/spi/spi_s3c24xx.c	2006-05-25 08:33:35.000000000 +0100
+++ linux-2.6.17-rc5-axparport/drivers/spi/spi_s3c24xx.c	2006-05-25 08:45:12.000000000 +0100
@@ -405,7 +405,7 @@ static int s3c24xx_spi_remove(struct pla
 
 static int s3c24xx_spi_suspend(struct platform_device *pdev, pm_message_t msg)
 {
-	struct s3c24xx_spi *hw = platform_get_drvdata(dev);
+	struct s3c24xx_spi *hw = platform_get_drvdata(pdev);
 
 	clk_disable(hw->clk);
 	return 0;
@@ -413,7 +413,7 @@ static int s3c24xx_spi_suspend(struct pl
 
 static int s3c24xx_spi_resume(struct platform_device *pdev)
 {
-	struct s3c24xx_spi *hw = platform_get_drvdata(dev);
+	struct s3c24xx_spi *hw = platform_get_drvdata(pdev);
 
 	clk_enable(hw->clk);
 	return 0;