diff -urpN -X ../dontdiff linux-2.6.19/Documentation/spi/spi-summary linux-2.6.19-simtec1p22/Documentation/spi/spi-summary
--- linux-2.6.19/Documentation/spi/spi-summary	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.19-simtec1p22/Documentation/spi/spi-summary	2007-01-15 15:20:12.000000000 +0000
@@ -312,7 +312,7 @@ might look like this unless you're creat
 		chip = kzalloc(sizeof *chip, GFP_KERNEL);
 		if (!chip)
 			return -ENOMEM;
-		dev_set_drvdata(&spi->dev, chip);
+		spi_set_drvdata(spi, chip);
 
 		... etc
 		return 0;
diff -urpN -X ../dontdiff linux-2.6.19/include/linux/spi/spi.h linux-2.6.19-simtec1p22/include/linux/spi/spi.h
--- linux-2.6.19/include/linux/spi/spi.h	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.19-simtec1p22/include/linux/spi/spi.h	2007-01-15 15:21:49.000000000 +0000
@@ -114,6 +114,17 @@ static inline void spi_set_ctldata(struc
 	spi->controller_state = state;
 }
 
+/* device driver data */
+
+static inline void spi_set_drvdata(struct spi_device *spi, void *data)
+{
+	dev_set_drvdata(&spi->dev, data);
+}
+
+static inline void *spi_get_drvdata(struct spi_device *spi)
+{
+	return dev_get_drvdata(&spi->dev);
+}
 
 struct spi_message;