diff options
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/act2000/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/isdn/capi/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/isdn/capi/capidrv.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/hardware/eicon/di.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/hardware/eicon/maintidi.c | 4 | ||||
| -rw-r--r-- | drivers/isdn/hardware/mISDN/hfcsusb.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/hardware/mISDN/hfcsusb.h | 2 | ||||
| -rw-r--r-- | drivers/isdn/hardware/mISDN/mISDNisar.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/hisax/hfc_usb.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/hysdn/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/isdn/i4l/isdn_net.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 6 | ||||
| -rw-r--r-- | drivers/isdn/i4l/isdn_ttyfax.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/icn/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/isdn/mISDN/dsp_core.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/mISDN/tei.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/pcbit/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/isdn/sc/Kconfig | 4 |
18 files changed, 15 insertions, 39 deletions
diff --git a/drivers/isdn/act2000/Kconfig b/drivers/isdn/act2000/Kconfig index 3fc1a5434ef7..fa2673fc69c2 100644 --- a/drivers/isdn/act2000/Kconfig +++ b/drivers/isdn/act2000/Kconfig | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | # | ||
| 2 | # Config.in for IBM Active 2000 ISDN driver | ||
| 3 | # | ||
| 4 | config ISDN_DRV_ACT2000 | 1 | config ISDN_DRV_ACT2000 |
| 5 | tristate "IBM Active 2000 support" | 2 | tristate "IBM Active 2000 support" |
| 6 | depends on ISA | 3 | depends on ISA |
| @@ -10,4 +7,3 @@ config ISDN_DRV_ACT2000 | |||
| 10 | into the card using a utility which is part of the latest | 7 | into the card using a utility which is part of the latest |
| 11 | isdn4k-utils package. Please read the file | 8 | isdn4k-utils package. Please read the file |
| 12 | <file:Documentation/isdn/README.act2000> for more information. | 9 | <file:Documentation/isdn/README.act2000> for more information. |
| 13 | |||
diff --git a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig index e1afd60924fb..b2a04755c96a 100644 --- a/drivers/isdn/capi/Kconfig +++ b/drivers/isdn/capi/Kconfig | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | # | ||
| 2 | # Config.in for the CAPI subsystem | ||
| 3 | # | ||
| 4 | config ISDN_DRV_AVMB1_VERBOSE_REASON | 1 | config ISDN_DRV_AVMB1_VERBOSE_REASON |
| 5 | bool "Verbose reason code reporting" | 2 | bool "Verbose reason code reporting" |
| 6 | default y | 3 | default y |
| @@ -59,4 +56,3 @@ config ISDN_CAPI_CAPIDRV | |||
| 59 | the legacy isdn4linux link layer. If you have a card which is | 56 | the legacy isdn4linux link layer. If you have a card which is |
| 60 | supported by a CAPI driver, but still want to use old features like | 57 | supported by a CAPI driver, but still want to use old features like |
| 61 | ippp interfaces or ttyI emulation, say Y/M here. | 58 | ippp interfaces or ttyI emulation, say Y/M here. |
| 62 | |||
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c index 3e6d17f42a98..66b7d7a86474 100644 --- a/drivers/isdn/capi/capidrv.c +++ b/drivers/isdn/capi/capidrv.c | |||
| @@ -830,7 +830,7 @@ static void handle_controller(_cmsg * cmsg) | |||
| 830 | case 0: break; | 830 | case 0: break; |
| 831 | case 1: s = "unknown class"; break; | 831 | case 1: s = "unknown class"; break; |
| 832 | case 2: s = "unknown function"; break; | 832 | case 2: s = "unknown function"; break; |
| 833 | default: s = "unkown error"; break; | 833 | default: s = "unknown error"; break; |
| 834 | } | 834 | } |
| 835 | if (s) | 835 | if (s) |
| 836 | printk(KERN_INFO "capidrv-%d: %s from controller 0x%x function %d: %s\n", | 836 | printk(KERN_INFO "capidrv-%d: %s from controller 0x%x function %d: %s\n", |
diff --git a/drivers/isdn/hardware/eicon/di.c b/drivers/isdn/hardware/eicon/di.c index b029d130eb21..cb14ae3e7154 100644 --- a/drivers/isdn/hardware/eicon/di.c +++ b/drivers/isdn/hardware/eicon/di.c | |||
| @@ -806,7 +806,7 @@ static void xdi_xlog_request (byte Adapter, byte Id, | |||
| 806 | DELIVERY - indication entered isdn_rc function | 806 | DELIVERY - indication entered isdn_rc function |
| 807 | RNR=... - application had returned RNR=... after the | 807 | RNR=... - application had returned RNR=... after the |
| 808 | look ahead callback | 808 | look ahead callback |
| 809 | RNum=0 - aplication had not returned any buffer to copy | 809 | RNum=0 - application had not returned any buffer to copy |
| 810 | this indication and will copy it self | 810 | this indication and will copy it self |
| 811 | COMPLETE - XDI had copied the data to the buffers provided | 811 | COMPLETE - XDI had copied the data to the buffers provided |
| 812 | bu the application and is about to issue the | 812 | bu the application and is about to issue the |
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 | } |
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c index fc46a26cb14f..a64bb6c67ba7 100644 --- a/drivers/isdn/hardware/mISDN/hfcsusb.c +++ b/drivers/isdn/hardware/mISDN/hfcsusb.c | |||
| @@ -721,7 +721,7 @@ hfcsusb_setup_bch(struct bchannel *bch, int protocol) | |||
| 721 | switch (protocol) { | 721 | switch (protocol) { |
| 722 | case (-1): /* used for init */ | 722 | case (-1): /* used for init */ |
| 723 | bch->state = -1; | 723 | bch->state = -1; |
| 724 | /* fall trough */ | 724 | /* fall through */ |
| 725 | case (ISDN_P_NONE): | 725 | case (ISDN_P_NONE): |
| 726 | if (bch->state == ISDN_P_NONE) | 726 | if (bch->state == ISDN_P_NONE) |
| 727 | return 0; /* already in idle state */ | 727 | return 0; /* already in idle state */ |
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.h b/drivers/isdn/hardware/mISDN/hfcsusb.h index 43efe7358fa3..369196adae03 100644 --- a/drivers/isdn/hardware/mISDN/hfcsusb.h +++ b/drivers/isdn/hardware/mISDN/hfcsusb.h | |||
| @@ -150,7 +150,7 @@ symbolic(struct hfcusb_symbolic_list list[], const int num) | |||
| 150 | for (i = 0; list[i].name != NULL; i++) | 150 | for (i = 0; list[i].name != NULL; i++) |
| 151 | if (list[i].num == num) | 151 | if (list[i].num == num) |
| 152 | return list[i].name; | 152 | return list[i].name; |
| 153 | return "<unkown USB Error>"; | 153 | return "<unknown USB Error>"; |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | /* USB descriptor need to contain one of the following EndPoint combination: */ | 156 | /* USB descriptor need to contain one of the following EndPoint combination: */ |
diff --git a/drivers/isdn/hardware/mISDN/mISDNisar.c b/drivers/isdn/hardware/mISDN/mISDNisar.c index de352a17673a..09095c747110 100644 --- a/drivers/isdn/hardware/mISDN/mISDNisar.c +++ b/drivers/isdn/hardware/mISDN/mISDNisar.c | |||
| @@ -860,7 +860,7 @@ isar_pump_statev_modem(struct isar_ch *ch, u8 devt) { | |||
| 860 | pr_debug("%s: pump stev GSTN CLEAR\n", ch->is->name); | 860 | pr_debug("%s: pump stev GSTN CLEAR\n", ch->is->name); |
| 861 | break; | 861 | break; |
| 862 | default: | 862 | default: |
| 863 | pr_info("u%s: nknown pump stev %x\n", ch->is->name, devt); | 863 | pr_info("u%s: unknown pump stev %x\n", ch->is->name, devt); |
| 864 | break; | 864 | break; |
| 865 | } | 865 | } |
| 866 | } | 866 | } |
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c index a420b64472e3..aaaeaafd86f4 100644 --- a/drivers/isdn/hisax/hfc_usb.c +++ b/drivers/isdn/hisax/hfc_usb.c | |||
| @@ -1086,7 +1086,7 @@ hfc_usb_l2l1(struct hisax_if *my_hisax_if, int pr, void *arg) | |||
| 1086 | break; | 1086 | break; |
| 1087 | default: | 1087 | default: |
| 1088 | DBG(HFCUSB_DBG_STATES, | 1088 | DBG(HFCUSB_DBG_STATES, |
| 1089 | "HFC_USB: hfc_usb_d_l2l1: unkown state : %#x", pr); | 1089 | "HFC_USB: hfc_usb_d_l2l1: unknown state : %#x", pr); |
| 1090 | break; | 1090 | break; |
| 1091 | } | 1091 | } |
| 1092 | } | 1092 | } |
diff --git a/drivers/isdn/hysdn/Kconfig b/drivers/isdn/hysdn/Kconfig index c9e4231968ef..e86bc6583d71 100644 --- a/drivers/isdn/hysdn/Kconfig +++ b/drivers/isdn/hysdn/Kconfig | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | # | ||
| 2 | # Config.in for HYSDN ISDN driver | ||
| 3 | # | ||
| 4 | config HYSDN | 1 | config HYSDN |
| 5 | tristate "Hypercope HYSDN cards (Champ, Ergo, Metro) support (module only)" | 2 | tristate "Hypercope HYSDN cards (Champ, Ergo, Metro) support (module only)" |
| 6 | depends on m && PROC_FS && PCI | 3 | depends on m && PROC_FS && PCI |
| @@ -15,4 +12,3 @@ config HYSDN_CAPI | |||
| 15 | depends on HYSDN && ISDN_CAPI | 12 | depends on HYSDN && ISDN_CAPI |
| 16 | help | 13 | help |
| 17 | Say Y here if you like to use Hypercope's CAPI 2.0 interface. | 14 | Say Y here if you like to use Hypercope's CAPI 2.0 interface. |
| 18 | |||
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index 90b56ed8651f..507e13d9a57c 100644 --- a/drivers/isdn/i4l/isdn_net.c +++ b/drivers/isdn/i4l/isdn_net.c | |||
| @@ -1563,7 +1563,7 @@ isdn_net_ciscohdlck_slarp_send_keepalive(unsigned long data) | |||
| 1563 | *(__be32 *)(p + 4) = cpu_to_be32(CISCO_SLARP_KEEPALIVE); | 1563 | *(__be32 *)(p + 4) = cpu_to_be32(CISCO_SLARP_KEEPALIVE); |
| 1564 | *(__be32 *)(p + 8) = cpu_to_be32(lp->cisco_myseq); | 1564 | *(__be32 *)(p + 8) = cpu_to_be32(lp->cisco_myseq); |
| 1565 | *(__be32 *)(p + 12) = cpu_to_be32(lp->cisco_yourseq); | 1565 | *(__be32 *)(p + 12) = cpu_to_be32(lp->cisco_yourseq); |
| 1566 | *(__be16 *)(p + 16) = cpu_to_be16(0xffff); // reliablity, always 0xffff | 1566 | *(__be16 *)(p + 16) = cpu_to_be16(0xffff); // reliability, always 0xffff |
| 1567 | p += 18; | 1567 | p += 18; |
| 1568 | 1568 | ||
| 1569 | isdn_net_write_super(lp, skb); | 1569 | isdn_net_write_super(lp, skb); |
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index 642d5aaf53ce..45df6675e8ed 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c | |||
| @@ -836,7 +836,7 @@ isdn_ppp_write(int min, struct file *file, const char __user *buf, int count) | |||
| 836 | unsigned short hl; | 836 | unsigned short hl; |
| 837 | struct sk_buff *skb; | 837 | struct sk_buff *skb; |
| 838 | /* | 838 | /* |
| 839 | * we need to reserve enought space in front of | 839 | * we need to reserve enough space in front of |
| 840 | * sk_buff. old call to dev_alloc_skb only reserved | 840 | * sk_buff. old call to dev_alloc_skb only reserved |
| 841 | * 16 bytes, now we are looking what the driver want | 841 | * 16 bytes, now we are looking what the driver want |
| 842 | */ | 842 | */ |
| @@ -1326,7 +1326,7 @@ isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
| 1326 | struct sk_buff *new_skb; | 1326 | struct sk_buff *new_skb; |
| 1327 | unsigned short hl; | 1327 | unsigned short hl; |
| 1328 | /* | 1328 | /* |
| 1329 | * we need to reserve enought space in front of | 1329 | * we need to reserve enough space in front of |
| 1330 | * sk_buff. old call to dev_alloc_skb only reserved | 1330 | * sk_buff. old call to dev_alloc_skb only reserved |
| 1331 | * 16 bytes, now we are looking what the driver want. | 1331 | * 16 bytes, now we are looking what the driver want. |
| 1332 | */ | 1332 | */ |
| @@ -1674,7 +1674,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, | |||
| 1674 | * - insert new fragment into the proper sequence slot (once that's done | 1674 | * - insert new fragment into the proper sequence slot (once that's done |
| 1675 | * newfrag will be set to NULL) | 1675 | * newfrag will be set to NULL) |
| 1676 | * - reassemble any complete fragment sequence (non-null 'start' | 1676 | * - reassemble any complete fragment sequence (non-null 'start' |
| 1677 | * indicates there is a continguous sequence present) | 1677 | * indicates there is a contiguous sequence present) |
| 1678 | * - discard any incomplete sequences that are below minseq -- due | 1678 | * - discard any incomplete sequences that are below minseq -- due |
| 1679 | * to the fact that sender always increment sequence number, if there | 1679 | * to the fact that sender always increment sequence number, if there |
| 1680 | * is an incomplete sequence below minseq, no new fragments would | 1680 | * is an incomplete sequence below minseq, no new fragments would |
diff --git a/drivers/isdn/i4l/isdn_ttyfax.c b/drivers/isdn/i4l/isdn_ttyfax.c index 78f7660c1d0e..4c41f191d4e2 100644 --- a/drivers/isdn/i4l/isdn_ttyfax.c +++ b/drivers/isdn/i4l/isdn_ttyfax.c | |||
| @@ -470,7 +470,7 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info) | |||
| 470 | } | 470 | } |
| 471 | return 0; | 471 | return 0; |
| 472 | } | 472 | } |
| 473 | /* BADMUL=value - dummy 0=disable errorchk disabled (treshold multiplier) */ | 473 | /* BADMUL=value - dummy 0=disable errorchk disabled (threshold multiplier) */ |
| 474 | if (!strncmp(p[0], "BADMUL", 6)) { | 474 | if (!strncmp(p[0], "BADMUL", 6)) { |
| 475 | p[0] += 6; | 475 | p[0] += 6; |
| 476 | switch (*p[0]) { | 476 | switch (*p[0]) { |
diff --git a/drivers/isdn/icn/Kconfig b/drivers/isdn/icn/Kconfig index 89d15eed765e..4534f21a1852 100644 --- a/drivers/isdn/icn/Kconfig +++ b/drivers/isdn/icn/Kconfig | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | # | ||
| 2 | # Config.in for ICN ISDN driver | ||
| 3 | # | ||
| 4 | config ISDN_DRV_ICN | 1 | config ISDN_DRV_ICN |
| 5 | tristate "ICN 2B and 4B support" | 2 | tristate "ICN 2B and 4B support" |
| 6 | depends on ISA | 3 | depends on ISA |
| @@ -13,4 +10,3 @@ config ISDN_DRV_ICN | |||
| 13 | separately. See <file:Documentation/isdn/README> and | 10 | separately. See <file:Documentation/isdn/README> and |
| 14 | <file:Documentation/isdn/README.icn> for more | 11 | <file:Documentation/isdn/README.icn> for more |
| 15 | information. | 12 | information. |
| 16 | |||
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c index 77ee2867c8b4..43ff4d3b046e 100644 --- a/drivers/isdn/mISDN/dsp_core.c +++ b/drivers/isdn/mISDN/dsp_core.c | |||
| @@ -110,7 +110,7 @@ | |||
| 110 | * crossconnections and conferences via software if not possible through | 110 | * crossconnections and conferences via software if not possible through |
| 111 | * hardware. If hardware capability is available, hardware is used. | 111 | * hardware. If hardware capability is available, hardware is used. |
| 112 | * | 112 | * |
| 113 | * Echo: Is generated by CMX and is used to check performane of hard and | 113 | * Echo: Is generated by CMX and is used to check performance of hard and |
| 114 | * software CMX. | 114 | * software CMX. |
| 115 | * | 115 | * |
| 116 | * The CMX has special functions for conferences with one, two and more | 116 | * The CMX has special functions for conferences with one, two and more |
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c index e04bad6c5baf..6d4da6095885 100644 --- a/drivers/isdn/mISDN/tei.c +++ b/drivers/isdn/mISDN/tei.c | |||
| @@ -725,7 +725,7 @@ tei_id_ver_tout_net(struct FsmInst *fi, int event, void *arg) | |||
| 725 | if (tm->rcnt == 1) { | 725 | if (tm->rcnt == 1) { |
| 726 | if (*debug & DEBUG_L2_TEI) | 726 | if (*debug & DEBUG_L2_TEI) |
| 727 | tm->tei_m.printdebug(fi, | 727 | tm->tei_m.printdebug(fi, |
| 728 | "check req for tei %d sucessful\n", tm->l2->tei); | 728 | "check req for tei %d successful\n", tm->l2->tei); |
| 729 | mISDN_FsmChangeState(fi, ST_TEI_NOP); | 729 | mISDN_FsmChangeState(fi, ST_TEI_NOP); |
| 730 | } else if (tm->rcnt > 1) { | 730 | } else if (tm->rcnt > 1) { |
| 731 | /* duplicate assignment; remove */ | 731 | /* duplicate assignment; remove */ |
diff --git a/drivers/isdn/pcbit/Kconfig b/drivers/isdn/pcbit/Kconfig index ffba6eca1244..e9b2dd85d410 100644 --- a/drivers/isdn/pcbit/Kconfig +++ b/drivers/isdn/pcbit/Kconfig | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | # | ||
| 2 | # Config.in for PCBIT ISDN driver | ||
| 3 | # | ||
| 4 | config ISDN_DRV_PCBIT | 1 | config ISDN_DRV_PCBIT |
| 5 | tristate "PCBIT-D support" | 2 | tristate "PCBIT-D support" |
| 6 | depends on ISA && (BROKEN || X86) | 3 | depends on ISA && (BROKEN || X86) |
| @@ -11,4 +8,3 @@ config ISDN_DRV_PCBIT | |||
| 11 | the card using a utility which is distributed separately. See | 8 | the card using a utility which is distributed separately. See |
| 12 | <file:Documentation/isdn/README> and | 9 | <file:Documentation/isdn/README> and |
| 13 | <file:Documentation/isdn/README.pcbit> for more information. | 10 | <file:Documentation/isdn/README.pcbit> for more information. |
| 14 | |||
diff --git a/drivers/isdn/sc/Kconfig b/drivers/isdn/sc/Kconfig index e6510ca7bf43..7469863a7925 100644 --- a/drivers/isdn/sc/Kconfig +++ b/drivers/isdn/sc/Kconfig | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | # | ||
| 2 | # Config.in for Spellcaster ISDN driver | ||
| 3 | # | ||
| 4 | config ISDN_DRV_SC | 1 | config ISDN_DRV_SC |
| 5 | tristate "Spellcaster support" | 2 | tristate "Spellcaster support" |
| 6 | depends on ISA | 3 | depends on ISA |
| @@ -9,4 +6,3 @@ config ISDN_DRV_SC | |||
| 9 | driver currently builds only in a modularized version. | 6 | driver currently builds only in a modularized version. |
| 10 | To build it, choose M here: the module will be called sc. | 7 | To build it, choose M here: the module will be called sc. |
| 11 | See <file:Documentation/isdn/README.sc> for more information. | 8 | See <file:Documentation/isdn/README.sc> for more information. |
| 12 | |||
