Index: linux-2.6.15/sound/soc/codecs/wm8731.c
===================================================================
--- linux-2.6.15.orig/sound/soc/codecs/wm8731.c	2006-02-22 00:11:17.000000000 +0000
+++ linux-2.6.15/sound/soc/codecs/wm8731.c	2006-02-22 11:25:55.000000000 +0000
@@ -614,11 +614,9 @@
 
 /* corgi i2c codec control layer */
 static struct i2c_driver wm8731_i2c_driver = {
-	.driver = {
-		.name = "WM8731 I2C Codec",
-		.owner = THIS_MODULE,
-	},
+	.name =           "WM8731 I2C Codec",
 	.id =             I2C_DRIVERID_WM8731,
+	.flags =          I2C_DF_NOTIFY,
 	.attach_adapter = wm8731_i2c_attach,
 	.detach_client =  wm8731_i2c_detach,
 	.command =        NULL,
@@ -626,6 +624,7 @@
 
 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-02-22 00:11:17.000000000 +0000
+++ linux-2.6.15/sound/soc/codecs/wm8750.c	2006-02-22 11:25:15.000000000 +0000
@@ -891,11 +891,9 @@
 
 /* corgi i2c codec control layer */
 static struct i2c_driver wm8750_i2c_driver = {
-	.driver = {
-		.name = "WM8750 I2C Codec",
-		.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,
@@ -903,6 +901,7 @@
 
 static struct i2c_client client_template = {
 	.name =   "WM8750",
+	.flags =  I2C_CLIENT_ALLOW_USE,
 	.driver = &wm8750_i2c_driver,
 };
 #endif