Commit 3544950f authored by Kai Germaschewski's avatar Kai Germaschewski

Merge vaio.(none):/home/kai/kernel/linux-2.5

into vaio.(none):/home/kai/kernel/linux-2.5.isdn
parents a814d16f 91912395
...@@ -161,6 +161,10 @@ CONFIG_HISAX_NI1 ...@@ -161,6 +161,10 @@ CONFIG_HISAX_NI1
Enable this if you like to use ISDN in US on a NI1 basic rate Enable this if you like to use ISDN in US on a NI1 basic rate
interface. 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 CONFIG_HISAX_16_0
This enables HiSax support for the Teles ISDN-cards S0-16.0, S0-8 This enables HiSax support for the Teles ISDN-cards S0-16.0, S0-8
and many compatibles. and many compatibles.
......
...@@ -416,7 +416,7 @@ st5481_setup_isocpipes(struct urb* urb[2], struct usb_device *dev, ...@@ -416,7 +416,7 @@ st5481_setup_isocpipes(struct urb* urb[2], struct usb_device *dev,
for (j = 0; j < 2; j++) { for (j = 0; j < 2; j++) {
retval = -ENOMEM; retval = -ENOMEM;
urb[j] = usb_alloc_urb(num_packet, GFP_KERNEL); urb[j] = usb_alloc_urb(num_packets, GFP_KERNEL);
if (!urb[j]) if (!urb[j])
goto err; goto err;
......
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