Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Germaschewski <kai@vaio.(none)>2002-02-25 14:29:47 +0100
committerKai Germaschewski <kai@vaio.(none)>2002-02-25 14:29:47 +0100
commit3544950fdfef1c15dc4b03f0baac5eaea404e100 (patch)
tree0e59060f9bbf13946bd17feb3c99bac141ccdf09
parenta814d16fe3abd6e8e5e2413425611833f07485a5 (diff)
parent9191239589b3b43c4b573cd32a97d2e944bf21ba (diff)
Merge vaio.(none):/home/kai/kernel/linux-2.5
into vaio.(none):/home/kai/kernel/linux-2.5.isdn
-rw-r--r--drivers/isdn/Config.help4
-rw-r--r--drivers/isdn/hisax/st5481_usb.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/isdn/Config.help b/drivers/isdn/Config.help
index a2bb99bc1fb8..ea6d042be449 100644
--- a/drivers/isdn/Config.help
+++ b/drivers/isdn/Config.help
@@ -161,6 +161,10 @@ CONFIG_HISAX_NI1
Enable this if you like to use ISDN in US on a NI1 basic rate
interface.
+CONFIG_HISAX_MAX_CARDS
+ This option allows you to specify the maximum number of cards which
+ the HiSax driver will be able to handle.
+
CONFIG_HISAX_16_0
This enables HiSax support for the Teles ISDN-cards S0-16.0, S0-8
and many compatibles.
diff --git a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c
index bd20feac8b7b..1a03312607b7 100644
--- a/drivers/isdn/hisax/st5481_usb.c
+++ b/drivers/isdn/hisax/st5481_usb.c
@@ -416,7 +416,7 @@ st5481_setup_isocpipes(struct urb* urb[2], struct usb_device *dev,
for (j = 0; j < 2; j++) {
retval = -ENOMEM;
- urb[j] = usb_alloc_urb(num_packet, GFP_KERNEL);
+ urb[j] = usb_alloc_urb(num_packets, GFP_KERNEL);
if (!urb[j])
goto err;