diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/media/video/saa7134/saa7134-cards.c | |
parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 61c6007c8ea6..50f1be05ebd3 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -7460,7 +7460,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
7460 | dev->tuner_type = TUNER_PHILIPS_FM1216ME_MK3; | 7460 | dev->tuner_type = TUNER_PHILIPS_FM1216ME_MK3; |
7461 | break; | 7461 | break; |
7462 | default: | 7462 | default: |
7463 | printk(KERN_ERR "%s Cant determine tuner type %x from EEPROM\n", dev->name, tuner_t); | 7463 | printk(KERN_ERR "%s Can't determine tuner type %x from EEPROM\n", dev->name, tuner_t); |
7464 | } | 7464 | } |
7465 | } else if ((data[1] != 0) && (data[1] != 0xff)) { | 7465 | } else if ((data[1] != 0) && (data[1] != 0xff)) { |
7466 | /* new config structure */ | 7466 | /* new config structure */ |
@@ -7480,7 +7480,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
7480 | printk(KERN_INFO "%s Board has DVB-T\n", dev->name); | 7480 | printk(KERN_INFO "%s Board has DVB-T\n", dev->name); |
7481 | break; | 7481 | break; |
7482 | default: | 7482 | default: |
7483 | printk(KERN_ERR "%s Cant determine tuner type %x from EEPROM\n", dev->name, tuner_t); | 7483 | printk(KERN_ERR "%s Can't determine tuner type %x from EEPROM\n", dev->name, tuner_t); |
7484 | } | 7484 | } |
7485 | } else { | 7485 | } else { |
7486 | printk(KERN_ERR "%s unexpected config structure\n", dev->name); | 7486 | printk(KERN_ERR "%s unexpected config structure\n", dev->name); |