diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/isdn/hardware/eicon/maintidi.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/isdn/hardware/eicon/maintidi.c')
| -rw-r--r-- | drivers/isdn/hardware/eicon/maintidi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hardware/eicon/maintidi.c b/drivers/isdn/hardware/eicon/maintidi.c index 41c26e756452..534978bdf382 100644 --- a/drivers/isdn/hardware/eicon/maintidi.c +++ b/drivers/isdn/hardware/eicon/maintidi.c | |||
| @@ -385,7 +385,7 @@ static int SuperTraceMessageInput (void* hLib) { | |||
| 385 | } | 385 | } |
| 386 | break; | 386 | break; |
| 387 | default: | 387 | default: |
| 388 | diva_mnt_internal_dprintf (0, DLI_ERR, "Unknon IDI Ind (DMA mode): %02x", Ind); | 388 | diva_mnt_internal_dprintf (0, DLI_ERR, "Unknown IDI Ind (DMA mode): %02x", Ind); |
| 389 | } | 389 | } |
| 390 | p += (this_ind_length+1); | 390 | p += (this_ind_length+1); |
| 391 | total_length -= (4 + this_ind_length); | 391 | total_length -= (4 + this_ind_length); |
| @@ -420,7 +420,7 @@ static int SuperTraceMessageInput (void* hLib) { | |||
| 420 | } | 420 | } |
| 421 | break; | 421 | break; |
| 422 | default: | 422 | default: |
| 423 | diva_mnt_internal_dprintf (0, DLI_ERR, "Unknon IDI Ind: %02x", Ind); | 423 | diva_mnt_internal_dprintf (0, DLI_ERR, "Unknown IDI Ind: %02x", Ind); |
| 424 | } | 424 | } |
| 425 | } | 425 | } |
| 426 | } | 426 | } |