diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-04-20 10:02:01 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-04-20 10:02:01 -0400 |
| commit | 62910554656cdcd6b6f84a5154c4155aae4ca231 (patch) | |
| tree | dcf14004f6fd2ef7154362ff948bfeba0f3ea92d /drivers/net/wan/sdla.c | |
| parent | 22265a5c3c103cf8c50be62e6c90d045eb649e6d (diff) | |
| parent | ab9304717f7624c41927f442e6b6d418b2d8b3e4 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
net/ipv6/netfilter/ip6t_REJECT.c
net/netfilter/xt_limit.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'drivers/net/wan/sdla.c')
| -rw-r--r-- | drivers/net/wan/sdla.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c index 31c41af2246d..43ae6f440bfb 100644 --- a/drivers/net/wan/sdla.c +++ b/drivers/net/wan/sdla.c | |||
| @@ -1352,7 +1352,7 @@ static int sdla_set_config(struct net_device *dev, struct ifmap *map) | |||
| 1352 | return(-EINVAL); | 1352 | return(-EINVAL); |
| 1353 | 1353 | ||
| 1354 | if (!request_region(map->base_addr, SDLA_IO_EXTENTS, dev->name)){ | 1354 | if (!request_region(map->base_addr, SDLA_IO_EXTENTS, dev->name)){ |
| 1355 | printk(KERN_WARNING "SDLA: io-port 0x%04lx in use \n", dev->base_addr); | 1355 | printk(KERN_WARNING "SDLA: io-port 0x%04lx in use\n", dev->base_addr); |
| 1356 | return(-EINVAL); | 1356 | return(-EINVAL); |
| 1357 | } | 1357 | } |
| 1358 | base = map->base_addr; | 1358 | base = map->base_addr; |