diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/tty/synclink_gt.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
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 a35dd549a00..18b48cd3b41 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; |