diff options
Diffstat (limited to 'drivers/media/video/ir-kbd-i2c.c')
-rw-r--r-- | drivers/media/video/ir-kbd-i2c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c index 9fc5055e001c..1e273ff3f956 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/drivers/media/video/ir-kbd-i2c.c | |||
@@ -308,7 +308,7 @@ static struct i2c_driver driver = { | |||
308 | 308 | ||
309 | static struct i2c_client client_template = | 309 | static struct i2c_client client_template = |
310 | { | 310 | { |
311 | I2C_DEVNAME("unset"), | 311 | .name = "unset", |
312 | .driver = &driver | 312 | .driver = &driver |
313 | }; | 313 | }; |
314 | 314 | ||
@@ -429,10 +429,10 @@ static int ir_probe(struct i2c_adapter *adap) | |||
429 | struct i2c_client c; char buf; int i,rc; | 429 | struct i2c_client c; char buf; int i,rc; |
430 | 430 | ||
431 | switch (adap->id) { | 431 | switch (adap->id) { |
432 | case I2C_ALGO_BIT | I2C_HW_B_BT848: | 432 | case I2C_HW_B_BT848: |
433 | probe = probe_bttv; | 433 | probe = probe_bttv; |
434 | break; | 434 | break; |
435 | case I2C_ALGO_SAA7134: | 435 | case I2C_HW_SAA7134: |
436 | probe = probe_saa7134; | 436 | probe = probe_saa7134; |
437 | break; | 437 | break; |
438 | } | 438 | } |