diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/tty/synclink_gt.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/tty/synclink_gt.c')
| -rw-r--r-- | drivers/tty/synclink_gt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c index a35dd549a008..18b48cd3b41d 100644 --- a/drivers/tty/synclink_gt.c +++ b/drivers/tty/synclink_gt.c | |||
| @@ -3491,7 +3491,7 @@ static int claim_resources(struct slgt_info *info) | |||
| 3491 | 3491 | ||
| 3492 | info->reg_addr = ioremap_nocache(info->phys_reg_addr, SLGT_REG_SIZE); | 3492 | info->reg_addr = ioremap_nocache(info->phys_reg_addr, SLGT_REG_SIZE); |
| 3493 | if (!info->reg_addr) { | 3493 | if (!info->reg_addr) { |
| 3494 | DBGERR(("%s cant map device registers, addr=%08X\n", | 3494 | DBGERR(("%s can't map device registers, addr=%08X\n", |
| 3495 | info->device_name, info->phys_reg_addr)); | 3495 | info->device_name, info->phys_reg_addr)); |
| 3496 | info->init_error = DiagStatus_CantAssignPciResources; | 3496 | info->init_error = DiagStatus_CantAssignPciResources; |
| 3497 | goto errout; | 3497 | goto errout; |