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

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

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.

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;