Skip to content

L
linux
Commit 0807dd03 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge http://linux-isdn.bkbits.net/linux-2.5.isdn 

into home.transmeta.com:/home/torvalds/v2.5/linux
parents e170a233 262b7e76
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 584 additions and 22 deletions
drivers/Makefile
View file @ 0807dd03
...@@ -39,6 +39,6 @@ obj-$(CONFIG_PHONE) += telephony/ ...@@ -39,6 +39,6 @@ obj-$(CONFIG_PHONE) += telephony/
obj-$(CONFIG_MD) += md/ obj-$(CONFIG_MD) += md/
obj-$(CONFIG_BLUEZ) += bluetooth/ obj-$(CONFIG_BLUEZ) += bluetooth/
obj-$(CONFIG_HOTPLUG_PCI) += hotplug/ obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
obj-$(CONFIG_ISDN) += isdn/ obj-$(CONFIG_ISDN_BOOL) += isdn/
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
drivers/isdn/act2000/Config.in
View file @ 0807dd03
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
# Config.in for IBM Active 2000 ISDN driver # Config.in for IBM Active 2000 ISDN driver
# #
dep_tristate 'IBM Active 2000 support' CONFIG_ISDN_DRV_ACT2000 $CONFIG_ISDN dep_tristate 'IBM Active 2000 support' CONFIG_ISDN_DRV_ACT2000 $CONFIG_ISDN $CONFIG_ISA
drivers/isdn/eicon/eicon_idi.c
View file @ 0807dd03
...@@ -2972,7 +2972,7 @@ idi_send_data(eicon_card *card, eicon_chan *chan, int ack, struct sk_buff *skb, ...@@ -2972,7 +2972,7 @@ idi_send_data(eicon_card *card, eicon_chan *chan, int ack, struct sk_buff *skb,
spin_unlock_irqrestore(&eicon_lock, flags); spin_unlock_irqrestore(&eicon_lock, flags);
eicon_log(card, 1, "idi_err: Ch%d: alloc_skb failed in send_data()\n", chan->No); eicon_log(card, 1, "idi_err: Ch%d: alloc_skb failed in send_data()\n", chan->No);
if (xmit_skb) if (xmit_skb)
dev_kfree_skb(skb); dev_kfree_skb(xmit_skb);
if (skb2) if (skb2)
dev_kfree_skb(skb2); dev_kfree_skb(skb2);
return -ENOMEM; return -ENOMEM;
......
drivers/isdn/hardware/avm/Config.in
View file @ 0807dd03
...@@ -8,12 +8,12 @@ comment 'Drivers for active AVM cards' ...@@ -8,12 +8,12 @@ comment 'Drivers for active AVM cards'
bool 'Support AVM cards' CONFIG_CAPI_AVM bool 'Support AVM cards' CONFIG_CAPI_AVM
if [ "$CONFIG_CAPI_AVM" != "n" ]; then if [ "$CONFIG_CAPI_AVM" != "n" ]; then
dep_tristate ' AVM B1 ISA support' CONFIG_ISDN_DRV_AVMB1_B1ISA $CONFIG_ISDN_CAPI dep_tristate ' AVM B1 ISA support' CONFIG_ISDN_DRV_AVMB1_B1ISA $CONFIG_ISDN_CAPI $CONFIG_SA
dep_tristate ' AVM B1 PCI support' CONFIG_ISDN_DRV_AVMB1_B1PCI $CONFIG_ISDN_CAPI $CONFIG_PCI dep_tristate ' AVM B1 PCI support' CONFIG_ISDN_DRV_AVMB1_B1PCI $CONFIG_ISDN_CAPI $CONFIG_PCI
dep_mbool ' AVM B1 PCI V4 support' CONFIG_ISDN_DRV_AVMB1_B1PCIV4 $CONFIG_ISDN_DRV_AVMB1_B1PCI dep_mbool ' AVM B1 PCI V4 support' CONFIG_ISDN_DRV_AVMB1_B1PCIV4 $CONFIG_ISDN_DRV_AVMB1_B1PCI
dep_tristate ' AVM T1/T1-B ISA support' CONFIG_ISDN_DRV_AVMB1_T1ISA $CONFIG_ISDN_CAPI dep_tristate ' AVM T1/T1-B ISA support' CONFIG_ISDN_DRV_AVMB1_T1ISA $CONFIG_ISDN_CAPI $CONFIG_ISA
dep_tristate ' AVM B1/M1/M2 PCMCIA support' CONFIG_ISDN_DRV_AVMB1_B1PCMCIA $CONFIG_ISDN_CAPI dep_tristate ' AVM B1/M1/M2 PCMCIA support' CONFIG_ISDN_DRV_AVMB1_B1PCMCIA $CONFIG_ISDN_CAPI
......
drivers/isdn/hardware/avm/b1pci.c
View file @ 0807dd03
...@@ -211,7 +211,7 @@ static int b1pciv4_probe(struct capicardparams *p, struct pci_dev *pdev) ...@@ -211,7 +211,7 @@ static int b1pciv4_probe(struct capicardparams *p, struct pci_dev *pdev)
goto err_free_dma; goto err_free_dma;
} }
card->mbase = ioremap_nocache(card->membase, 64); card->mbase = ioremap(card->membase, 64);
if (!card->mbase) { if (!card->mbase) {
printk(KERN_NOTICE "b1pci: can't remap memory at 0x%lx\n", printk(KERN_NOTICE "b1pci: can't remap memory at 0x%lx\n",
card->membase); card->membase);
......
drivers/isdn/hardware/avm/c4.c
View file @ 0807dd03
...@@ -1129,7 +1129,7 @@ static int c4_add_card(struct capicardparams *p, struct pci_dev *dev, ...@@ -1129,7 +1129,7 @@ static int c4_add_card(struct capicardparams *p, struct pci_dev *dev,
goto err_free_dma; goto err_free_dma;
} }
card->mbase = ioremap_nocache(card->membase, 128); card->mbase = ioremap(card->membase, 128);
if (card->mbase == 0) { if (card->mbase == 0) {
printk(KERN_NOTICE "c4: can't remap memory at 0x%lx\n", printk(KERN_NOTICE "c4: can't remap memory at 0x%lx\n",
card->membase); card->membase);
......
drivers/isdn/hardware/avm/t1pci.c
View file @ 0807dd03
...@@ -79,7 +79,7 @@ static int t1pci_add_card(struct capicardparams *p, struct pci_dev *pdev) ...@@ -79,7 +79,7 @@ static int t1pci_add_card(struct capicardparams *p, struct pci_dev *pdev)
goto err_free_dma; goto err_free_dma;
} }
card->mbase = ioremap_nocache(card->membase, 64); card->mbase = ioremap(card->membase, 64);
if (!card->mbase) { if (!card->mbase) {
printk(KERN_NOTICE "t1pci: can't remap memory at 0x%lx\n", printk(KERN_NOTICE "t1pci: can't remap memory at 0x%lx\n",
card->membase); card->membase);
......
drivers/isdn/hisax/Config.help
View file @ 0807dd03
...@@ -251,6 +251,10 @@ CONFIG_HISAX_SEDLBAUER_CS ...@@ -251,6 +251,10 @@ CONFIG_HISAX_SEDLBAUER_CS
This enables the PCMCIA client driver for the Sedlbauer Speed Star This enables the PCMCIA client driver for the Sedlbauer Speed Star
and Speed Star II cards. and Speed Star II cards.
CONFIG_HISAX_AVM_A1_CS
This enables the PCMCIA client driver for the AVM A1 / Fritz!Card
PCMCIA cards.
CONFIG_HISAX_ST5481 CONFIG_HISAX_ST5481
This enables the driver for ST5481 based USB ISDN adapters, This enables the driver for ST5481 based USB ISDN adapters,
e.g. the BeWan Gazel 128 USB e.g. the BeWan Gazel 128 USB
......
drivers/isdn/hisax/Config.in
View file @ 0807dd03
...@@ -14,28 +14,28 @@ if [ "$CONFIG_ISDN_DRV_HISAX" != "n" ]; then ...@@ -14,28 +14,28 @@ if [ "$CONFIG_ISDN_DRV_HISAX" != "n" ]; then
bool ' HiSax Support for US NI1' CONFIG_HISAX_NI1 bool ' HiSax Support for US NI1' CONFIG_HISAX_NI1
int ' Maximum number of cards supported by HiSax' CONFIG_HISAX_MAX_CARDS 8 int ' Maximum number of cards supported by HiSax' CONFIG_HISAX_MAX_CARDS 8
comment ' HiSax supported cards' comment ' HiSax supported cards'
bool ' Teles 16.0/8.0' CONFIG_HISAX_16_0 bool ' Teles 16.0/8.0' CONFIG_HISAX_16_0 $CONFIG_ISA
bool ' Teles 16.3 or PNP or PCMCIA' CONFIG_HISAX_16_3 bool ' Teles 16.3 or PNP or PCMCIA' CONFIG_HISAX_16_3
bool ' Teles PCI' CONFIG_HISAX_TELESPCI bool ' Teles PCI' CONFIG_HISAX_TELESPCI
bool ' Teles S0Box' CONFIG_HISAX_S0BOX bool ' Teles S0Box' CONFIG_HISAX_S0BOX
bool ' AVM A1 (Fritz)' CONFIG_HISAX_AVM_A1 bool ' AVM A1 (Fritz)' CONFIG_HISAX_AVM_A1 $CONFIG_ISA
bool ' AVM PnP/PCI (Fritz!PnP/PCI)' CONFIG_HISAX_FRITZPCI bool ' AVM PnP/PCI (Fritz!PnP/PCI)' CONFIG_HISAX_FRITZPCI
bool ' AVM A1 PCMCIA (Fritz)' CONFIG_HISAX_AVM_A1_PCMCIA bool ' AVM A1 PCMCIA (Fritz)' CONFIG_HISAX_AVM_A1_PCMCIA
bool ' Elsa cards' CONFIG_HISAX_ELSA bool ' Elsa cards' CONFIG_HISAX_ELSA
bool ' ITK ix1-micro Revision 2' CONFIG_HISAX_IX1MICROR2 bool ' ITK ix1-micro Revision 2' CONFIG_HISAX_IX1MICROR2 $CONFIG_ISA
bool ' Eicon.Diehl Diva cards' CONFIG_HISAX_DIEHLDIVA bool ' Eicon.Diehl Diva cards' CONFIG_HISAX_DIEHLDIVA
bool ' ASUSCOM ISA cards' CONFIG_HISAX_ASUSCOM bool ' ASUSCOM ISA cards' CONFIG_HISAX_ASUSCOM $CONFIG_ISA
bool ' TELEINT cards' CONFIG_HISAX_TELEINT bool ' TELEINT cards' CONFIG_HISAX_TELEINT $CONFIG_ISA
bool ' HFC-S based cards' CONFIG_HISAX_HFCS bool ' HFC-S based cards' CONFIG_HISAX_HFCS $CONFIG_ISA
bool ' Sedlbauer cards' CONFIG_HISAX_SEDLBAUER bool ' Sedlbauer cards' CONFIG_HISAX_SEDLBAUER
bool ' USR Sportster internal TA' CONFIG_HISAX_SPORTSTER bool ' USR Sportster internal TA' CONFIG_HISAX_SPORTSTER $CONFIG_ISA
bool ' MIC card' CONFIG_HISAX_MIC bool ' MIC card' CONFIG_HISAX_MIC $CONFIG_ISA
bool ' NETjet card' CONFIG_HISAX_NETJET bool ' NETjet card' CONFIG_HISAX_NETJET
bool ' NETspider U card' CONFIG_HISAX_NETJET_U bool ' NETspider U card' CONFIG_HISAX_NETJET_U
bool ' Niccy PnP/PCI card' CONFIG_HISAX_NICCY bool ' Niccy PnP/PCI card' CONFIG_HISAX_NICCY
bool ' Siemens I-Surf card' CONFIG_HISAX_ISURF bool ' Siemens I-Surf card' CONFIG_HISAX_ISURF $CONFIG_ISA
bool ' HST Saphir card' CONFIG_HISAX_HSTSAPHIR bool ' HST Saphir card' CONFIG_HISAX_HSTSAPHIR $CONFIG_ISA
bool ' Telekom A4T card' CONFIG_HISAX_BKM_A4T bool ' Telekom A4T card' CONFIG_HISAX_BKM_A4T
bool ' Scitel Quadro card' CONFIG_HISAX_SCT_QUADRO bool ' Scitel Quadro card' CONFIG_HISAX_SCT_QUADRO
bool ' Gazel cards' CONFIG_HISAX_GAZEL bool ' Gazel cards' CONFIG_HISAX_GAZEL
bool ' HFC PCI-Bus cards' CONFIG_HISAX_HFC_PCI bool ' HFC PCI-Bus cards' CONFIG_HISAX_HFC_PCI
...@@ -52,6 +52,7 @@ if [ "$CONFIG_ISDN_DRV_HISAX" != "n" ]; then ...@@ -52,6 +52,7 @@ if [ "$CONFIG_ISDN_DRV_HISAX" != "n" ]; then
dep_tristate 'Sedlbauer PCMCIA cards' CONFIG_HISAX_SEDLBAUER_CS $CONFIG_ISDN_DRV_HISAX $CONFIG_PCMCIA dep_tristate 'Sedlbauer PCMCIA cards' CONFIG_HISAX_SEDLBAUER_CS $CONFIG_ISDN_DRV_HISAX $CONFIG_PCMCIA
dep_tristate 'ELSA PCMCIA MicroLink cards' CONFIG_HISAX_ELSA_CS $CONFIG_ISDN_DRV_HISAX $CONFIG_PCMCIA dep_tristate 'ELSA PCMCIA MicroLink cards' CONFIG_HISAX_ELSA_CS $CONFIG_ISDN_DRV_HISAX $CONFIG_PCMCIA
dep_tristate 'AVM A1 PCMCIA cards' CONFIG_HISAX_AVM_A1_CS $CONFIG_ISDN_DRV_HISAX $CONFIG_PCMCIA
dep_tristate 'ST5481 USB ISDN modem (EXPERIMENTAL)' CONFIG_HISAX_ST5481 $CONFIG_ISDN_DRV_HISAX $CONFIG_USB $CONFIG_EXPERIMENTAL dep_tristate 'ST5481 USB ISDN modem (EXPERIMENTAL)' CONFIG_HISAX_ST5481 $CONFIG_ISDN_DRV_HISAX $CONFIG_USB $CONFIG_EXPERIMENTAL
dep_tristate 'AVM Fritz!Card PCI/PCIv2/PnP support (EXPERIMENTAL)' CONFIG_HISAX_FRITZ_PCIPNP $CONFIG_ISDN_DRV_HISAX $CONFIG_EXPERIMENTAL dep_tristate 'AVM Fritz!Card PCI/PCIv2/PnP support (EXPERIMENTAL)' CONFIG_HISAX_FRITZ_PCIPNP $CONFIG_ISDN_DRV_HISAX $CONFIG_EXPERIMENTAL
dep_tristate 'AVM Fritz!Card classic support (EXPERIMENTAL)' CONFIG_HISAX_FRITZ_CLASSIC $CONFIG_ISDN_DRV_HISAX $CONFIG_EXPERIMENTAL dep_tristate 'AVM Fritz!Card classic support (EXPERIMENTAL)' CONFIG_HISAX_FRITZ_CLASSIC $CONFIG_ISDN_DRV_HISAX $CONFIG_EXPERIMENTAL
......
drivers/isdn/hisax/Makefile
View file @ 0807dd03
...@@ -13,6 +13,7 @@ export-objs := config.o hisax_isac.o hisax_hscx.o ...@@ -13,6 +13,7 @@ export-objs := config.o hisax_isac.o hisax_hscx.o
obj-$(CONFIG_ISDN_DRV_HISAX) += hisax.o obj-$(CONFIG_ISDN_DRV_HISAX) += hisax.o
obj-$(CONFIG_HISAX_SEDLBAUER_CS) += sedlbauer_cs.o obj-$(CONFIG_HISAX_SEDLBAUER_CS) += sedlbauer_cs.o
obj-$(CONFIG_HISAX_ELSA_CS) += elsa_cs.o obj-$(CONFIG_HISAX_ELSA_CS) += elsa_cs.o
obj-$(CONFIG_HISAX_AVM_A1_CS) += avma1_cs.o
obj-$(CONFIG_HISAX_ST5481) += hisax_st5481.o obj-$(CONFIG_HISAX_ST5481) += hisax_st5481.o
obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_isac.o hisax_fcpcipnp.o obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_isac.o hisax_fcpcipnp.o
obj-$(CONFIG_HISAX_FRITZ_CLASSIC) += hisax_isac.o hisax_hscx.o hisax_fcclassic.o obj-$(CONFIG_HISAX_FRITZ_CLASSIC) += hisax_isac.o hisax_hscx.o hisax_fcclassic.o
......
drivers/isdn/hisax/avma1_cs.c 0 → 100644
View file @ 0807dd03
This diff is collapsed.
drivers/isdn/icn/Config.in
View file @ 0807dd03
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
# Config.in for ICN ISDN driver # Config.in for ICN ISDN driver
# #
dep_tristate 'ICN 2B and 4B support' CONFIG_ISDN_DRV_ICN $CONFIG_ISDN dep_tristate 'ICN 2B and 4B support' CONFIG_ISDN_DRV_ICN $CONFIG_ISDN $CONFIG_ISA
drivers/isdn/pcbit/Config.in
View file @ 0807dd03
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
# Config.in for PCBIT ISDN driver # Config.in for PCBIT ISDN driver
# #
dep_tristate 'PCBIT-D support' CONFIG_ISDN_DRV_PCBIT $CONFIG_ISDN dep_tristate 'PCBIT-D support' CONFIG_ISDN_DRV_PCBIT $CONFIG_ISDN $CONFIG_ISA
drivers/isdn/pcbit/pcbit.h
View file @ 0807dd03
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
#ifndef PCBIT_H #ifndef PCBIT_H
#define PCBIT_H #define PCBIT_H
#include <linux/tqueue.h>
#define MAX_PCBIT_CARDS 4 #define MAX_PCBIT_CARDS 4
......
drivers/isdn/sc/Config.in
View file @ 0807dd03
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
# Config.in for Spellcaster ISDN driver # Config.in for Spellcaster ISDN driver
# #
dep_tristate 'Spellcaster support' CONFIG_ISDN_DRV_SC $CONFIG_ISDN dep_tristate 'Spellcaster support' CONFIG_ISDN_DRV_SC $CONFIG_ISDN $CONFIG_ISA
drivers/isdn/tpam/tpam.h
View file @ 0807dd03
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/isdnif.h> #include <linux/isdnif.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/tqueue.h>
/* Maximum number of channels for this board */ /* Maximum number of channels for this board */
#define TPAM_NBCHANNEL 30 #define TPAM_NBCHANNEL 30
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7