Index: linux-2.6.15/sound/soc/codecs/wm8731.c
===================================================================
--- linux-2.6.15.orig/sound/soc/codecs/wm8731.c	2006-01-28 17:29:00.000000000 +0000
+++ linux-2.6.15/sound/soc/codecs/wm8731.c	2006-01-28 17:47:54.000000000 +0000
@@ -549,9 +549,11 @@
 
 /* corgi i2c codec control layer */
 static struct i2c_driver wm8731_i2c_driver = {
-	.name =           "WM8731 I2C Codec",
+	.driver = {
+		.name  = "WM8731 I2C Codec",
+		.owner = THIS_MODULE,
+	},
 	.id =             I2C_DRIVERID_WM8731,
-	.flags =          I2C_DF_NOTIFY,
 	.attach_adapter = wm8731_i2c_attach,
 	.detach_client =  wm8731_i2c_detach,
 	.command =        NULL,
@@ -559,7 +561,6 @@
 
 static struct i2c_client client_template = {
 	.name =   "WM8731",
-	.flags =  I2C_CLIENT_ALLOW_USE,
 	.driver = &wm8731_i2c_driver,
 };
 #endif
Index: linux-2.6.15/sound/soc/codecs/wm8750.c
===================================================================
--- linux-2.6.15.orig/sound/soc/codecs/wm8750.c	2006-01-28 17:29:00.000000000 +0000
+++ linux-2.6.15/sound/soc/codecs/wm8750.c	2006-01-28 17:47:12.000000000 +0000
@@ -844,9 +844,11 @@
 
 /* corgi i2c codec control layer */
 static struct i2c_driver wm8750_i2c_driver = {
-	.name =           "WM8750 I2C Codec",
+	.driver = {
+		.owner = THIS_MODULE,
+		.name  = "WM8750 I2C Codec",
+	},
 	.id =             I2C_DRIVERID_WM8750,
-	.flags =          I2C_DF_NOTIFY,
 	.attach_adapter = wm8750_i2c_attach,
 	.detach_client =  wm8750_i2c_detach,
 	.command =        NULL,
@@ -854,7 +856,6 @@
 
 static struct i2c_client client_template = {
 	.name =   "WM8750",
-	.flags =  I2C_CLIENT_ALLOW_USE,
 	.driver = &wm8750_i2c_driver,
 };
 #endif