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/tty/synclinkmp.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/tty/synclinkmp.c')
-rw-r--r-- | drivers/tty/synclinkmp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c index 327343694473..c77831c7675a 100644 --- a/drivers/tty/synclinkmp.c +++ b/drivers/tty/synclinkmp.c | |||
@@ -3595,7 +3595,7 @@ static int claim_resources(SLMP_INFO *info) | |||
3595 | info->memory_base = ioremap_nocache(info->phys_memory_base, | 3595 | info->memory_base = ioremap_nocache(info->phys_memory_base, |
3596 | SCA_MEM_SIZE); | 3596 | SCA_MEM_SIZE); |
3597 | if (!info->memory_base) { | 3597 | if (!info->memory_base) { |
3598 | printk( "%s(%d):%s Cant map shared memory, MemAddr=%08X\n", | 3598 | printk( "%s(%d):%s Can't map shared memory, MemAddr=%08X\n", |
3599 | __FILE__,__LINE__,info->device_name, info->phys_memory_base ); | 3599 | __FILE__,__LINE__,info->device_name, info->phys_memory_base ); |
3600 | info->init_error = DiagStatus_CantAssignPciResources; | 3600 | info->init_error = DiagStatus_CantAssignPciResources; |
3601 | goto errout; | 3601 | goto errout; |
@@ -3603,7 +3603,7 @@ static int claim_resources(SLMP_INFO *info) | |||
3603 | 3603 | ||
3604 | info->lcr_base = ioremap_nocache(info->phys_lcr_base, PAGE_SIZE); | 3604 | info->lcr_base = ioremap_nocache(info->phys_lcr_base, PAGE_SIZE); |
3605 | if (!info->lcr_base) { | 3605 | if (!info->lcr_base) { |
3606 | printk( "%s(%d):%s Cant map LCR memory, MemAddr=%08X\n", | 3606 | printk( "%s(%d):%s Can't map LCR memory, MemAddr=%08X\n", |
3607 | __FILE__,__LINE__,info->device_name, info->phys_lcr_base ); | 3607 | __FILE__,__LINE__,info->device_name, info->phys_lcr_base ); |
3608 | info->init_error = DiagStatus_CantAssignPciResources; | 3608 | info->init_error = DiagStatus_CantAssignPciResources; |
3609 | goto errout; | 3609 | goto errout; |
@@ -3612,7 +3612,7 @@ static int claim_resources(SLMP_INFO *info) | |||
3612 | 3612 | ||
3613 | info->sca_base = ioremap_nocache(info->phys_sca_base, PAGE_SIZE); | 3613 | info->sca_base = ioremap_nocache(info->phys_sca_base, PAGE_SIZE); |
3614 | if (!info->sca_base) { | 3614 | if (!info->sca_base) { |
3615 | printk( "%s(%d):%s Cant map SCA memory, MemAddr=%08X\n", | 3615 | printk( "%s(%d):%s Can't map SCA memory, MemAddr=%08X\n", |
3616 | __FILE__,__LINE__,info->device_name, info->phys_sca_base ); | 3616 | __FILE__,__LINE__,info->device_name, info->phys_sca_base ); |
3617 | info->init_error = DiagStatus_CantAssignPciResources; | 3617 | info->init_error = DiagStatus_CantAssignPciResources; |
3618 | goto errout; | 3618 | goto errout; |
@@ -3622,7 +3622,7 @@ static int claim_resources(SLMP_INFO *info) | |||
3622 | info->statctrl_base = ioremap_nocache(info->phys_statctrl_base, | 3622 | info->statctrl_base = ioremap_nocache(info->phys_statctrl_base, |
3623 | PAGE_SIZE); | 3623 | PAGE_SIZE); |
3624 | if (!info->statctrl_base) { | 3624 | if (!info->statctrl_base) { |
3625 | printk( "%s(%d):%s Cant map SCA Status/Control memory, MemAddr=%08X\n", | 3625 | printk( "%s(%d):%s Can't map SCA Status/Control memory, MemAddr=%08X\n", |
3626 | __FILE__,__LINE__,info->device_name, info->phys_statctrl_base ); | 3626 | __FILE__,__LINE__,info->device_name, info->phys_statctrl_base ); |
3627 | info->init_error = DiagStatus_CantAssignPciResources; | 3627 | info->init_error = DiagStatus_CantAssignPciResources; |
3628 | goto errout; | 3628 | goto errout; |
@@ -3869,7 +3869,7 @@ static void device_init(int adapter_num, struct pci_dev *pdev) | |||
3869 | port_array[0]->irq_flags, | 3869 | port_array[0]->irq_flags, |
3870 | port_array[0]->device_name, | 3870 | port_array[0]->device_name, |
3871 | port_array[0]) < 0 ) { | 3871 | port_array[0]) < 0 ) { |
3872 | printk( "%s(%d):%s Cant request interrupt, IRQ=%d\n", | 3872 | printk( "%s(%d):%s Can't request interrupt, IRQ=%d\n", |
3873 | __FILE__,__LINE__, | 3873 | __FILE__,__LINE__, |
3874 | port_array[0]->device_name, | 3874 | port_array[0]->device_name, |
3875 | port_array[0]->irq_level ); | 3875 | port_array[0]->irq_level ); |