diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-14 07:11:02 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-14 07:11:02 -0400 |
| commit | ac7c5353b189e10cf5dd27399f64f7b013abffc6 (patch) | |
| tree | 8222d92b774c256d6ec4399c716d76b3f05ddc4b /sound/soc | |
| parent | a8f75ea70c58546205fb7673be41455b9da5d9a7 (diff) | |
| parent | 120dd64cacd4fb796bca0acba3665553f1d9ecaa (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 569ecaca0e8b..889a897d41ac 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c | |||
| @@ -1187,10 +1187,8 @@ static struct i2c_driver aic3x_i2c_driver = { | |||
| 1187 | .name = "aic3x I2C Codec", | 1187 | .name = "aic3x I2C Codec", |
| 1188 | .owner = THIS_MODULE, | 1188 | .owner = THIS_MODULE, |
| 1189 | }, | 1189 | }, |
| 1190 | .id = I2C_DRIVERID_I2CDEV, | ||
| 1191 | .attach_adapter = aic3x_i2c_attach, | 1190 | .attach_adapter = aic3x_i2c_attach, |
| 1192 | .detach_client = aic3x_i2c_detach, | 1191 | .detach_client = aic3x_i2c_detach, |
| 1193 | .command = NULL, | ||
| 1194 | }; | 1192 | }; |
| 1195 | 1193 | ||
| 1196 | static struct i2c_client client_template = { | 1194 | static struct i2c_client client_template = { |