--- a/drivers/spi/spi.c	2006-10-19 11:13:21.000000000 +0200
+++ b/drivers/spi/spi.c	2006-10-19 11:13:04.000000000 +0200
@@ -367,6 +367,7 @@ spi_alloc_master(struct device *dev, uns
 
 	class_device_initialize(&master->cdev);
 	master->cdev.class = &spi_master_class;
+	kobj_set_kset_s(&master->cdev, spi_master_class.subsys);
 	master->cdev.dev = get_device(dev);
 	spi_master_set_devdata(master, &master[1]);