diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-17 03:05:02 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-17 03:05:02 -0500 |
| commit | a2bfbc072e279ff81e6b336acff612b9bc2e5281 (patch) | |
| tree | 89cfe21911e1539e1b7f89d8a10d42abecba2a18 /drivers/isdn/hardware | |
| parent | 5c427ff9e4cc61625d48172ea082ae99e21eea6a (diff) | |
| parent | 82b3cc1a2f5e46300a9dec4a8cc8106dc20a4c23 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/can/Kconfig
Diffstat (limited to 'drivers/isdn/hardware')
| -rw-r--r-- | drivers/isdn/hardware/mISDN/hfcmulti.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c index faed794cf75a..a6624ad252c5 100644 --- a/drivers/isdn/hardware/mISDN/hfcmulti.c +++ b/drivers/isdn/hardware/mISDN/hfcmulti.c | |||
| @@ -5481,7 +5481,7 @@ HFCmulti_init(void) | |||
| 5481 | if (err) { | 5481 | if (err) { |
| 5482 | printk(KERN_ERR "error registering embedded driver: " | 5482 | printk(KERN_ERR "error registering embedded driver: " |
| 5483 | "%x\n", err); | 5483 | "%x\n", err); |
| 5484 | return -err; | 5484 | return err; |
| 5485 | } | 5485 | } |
| 5486 | HFC_cnt++; | 5486 | HFC_cnt++; |
| 5487 | printk(KERN_INFO "%d devices registered\n", HFC_cnt); | 5487 | printk(KERN_INFO "%d devices registered\n", HFC_cnt); |