diff options
| author | Igor Mammedov <niallain@gmail.com> | 2008-04-28 19:08:21 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-28 19:08:21 -0400 |
| commit | e9f20d6f03e8df393b001dab6dc5226c2a5daf57 (patch) | |
| tree | 73e94fa5e4f83576c97e36187b809c5aad2ade30 /drivers/isdn/hisax/avm_pci.c | |
| parent | bf62fd887cab230f5952b611bde25e8e15acb454 (diff) | |
| parent | e31a94ed371c70855eb30b77c490d6d85dd4da26 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/isdn/hisax/avm_pci.c')
| -rw-r--r-- | drivers/isdn/hisax/avm_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c index 0f1db1f669b2..7cabc5a19492 100644 --- a/drivers/isdn/hisax/avm_pci.c +++ b/drivers/isdn/hisax/avm_pci.c | |||
| @@ -797,7 +797,7 @@ static int __devinit avm_pnp_setup(struct IsdnCardState *cs) | |||
| 797 | err = pnp_activate_dev(pnp_avm_d); | 797 | err = pnp_activate_dev(pnp_avm_d); |
| 798 | if (err<0) { | 798 | if (err<0) { |
| 799 | printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", | 799 | printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", |
| 800 | __FUNCTION__, err); | 800 | __func__, err); |
| 801 | return(0); | 801 | return(0); |
| 802 | } | 802 | } |
| 803 | cs->hw.avm.cfg_reg = | 803 | cs->hw.avm.cfg_reg = |