From b11c67c2789a07a899a505085837e02b98bbf907 Mon Sep 17 00:00:00 2001
From: Laurent Riffard <laurent.riffard@free.fr>
Date: Sat, 26 Nov 2005 20:46:32 +0100
Subject: [PATCH] --- yaml --- r: 16693 b: refs/heads/master c:
 d74cdab1cad1e5895d8928eeeb2ac469f8410d2e h: refs/heads/master i:   16691:
 c7f46296dbc615108ef6633aa51d5350ef7adf21 v: v3

---
 [refs]                                | 2 +-
 trunk/sound/oss/dmasound/dac3550a.c   | 6 ++++--
 trunk/sound/oss/dmasound/tas_common.c | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4e3e2765bf05..4a33d62bcee0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 604f28e2b8d34cbaf08f0351374645f161335a82
+refs/heads/master: d74cdab1cad1e5895d8928eeeb2ac469f8410d2e
diff --git a/trunk/sound/oss/dmasound/dac3550a.c b/trunk/sound/oss/dmasound/dac3550a.c
index 3402a663d07f..835e0cfc3bf3 100644
--- a/trunk/sound/oss/dmasound/dac3550a.c
+++ b/trunk/sound/oss/dmasound/dac3550a.c
@@ -41,8 +41,10 @@ static int daca_detect_client(struct i2c_adapter *adapter, int address);
 static int daca_detach_client(struct i2c_client *client);
 
 struct i2c_driver daca_driver = {  
-	.owner			= THIS_MODULE,
-	.name			= "DAC3550A driver  V " DACA_VERSION,
+	.driver = {
+		.owner		= THIS_MODULE,
+		.name		= "DAC3550A driver  V " DACA_VERSION,
+	},
 	.id			= I2C_DRIVERID_DACA,
 	.attach_adapter		= daca_attach_adapter,
 	.detach_client		= daca_detach_client,
diff --git a/trunk/sound/oss/dmasound/tas_common.c b/trunk/sound/oss/dmasound/tas_common.c
index 7e3d517af4b9..bd6910af286c 100644
--- a/trunk/sound/oss/dmasound/tas_common.c
+++ b/trunk/sound/oss/dmasound/tas_common.c
@@ -47,8 +47,10 @@ static int tas_attach_adapter(struct i2c_adapter *);
 static int tas_detach_client(struct i2c_client *);
 
 struct i2c_driver tas_driver = {
-	.owner		= THIS_MODULE,
-	.name		= "tas",
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "tas",
+	},
 	.attach_adapter	= tas_attach_adapter,
 	.detach_client	= tas_detach_client,
 };