Merge tp1.ruhr-uni-bochum.de:/scratch/kai/kernel/v2.5/linux-2.5

into tp1.ruhr-uni-bochum.de:/scratch/kai/kernel/v2.5/linux-2.5.isdn

drivers/isdn/hisax/config.c

@@ -2138,7 +2138,7 @@ request_mmio(struct resources *rs, unsigned long start, int len,
 }
 
 void
-hisax_resources_release(struct IsdnCardState *cs)
+hisax_release_resources(struct IsdnCardState *cs)
 {
 	resources_release(&cs->rs);
 }

drivers/isdn/hisax/hisax_fcpcipnp.c

@@ -58,7 +58,7 @@ static struct pci_device_id fcpci_ids[] __devinitdata = {
 };
 MODULE_DEVICE_TABLE(pci, fcpci_ids);
 
-static struct pnp_card_id fcpnp_ids[] __devinitdata = {
+static struct pnp_card_device_id fcpnp_ids[] __devinitdata = {
 	{ .id = "AVM0900", 
 	  .driver_data = (unsigned long) "Fritz!Card PnP",
 	  .devs = { { "AVM0900" } } }

drivers/isdn/i4l/isdn_ppp_ccp.c

@@ -241,7 +241,7 @@ ippp_ccp_alloc(void)
 	struct ippp_ccp *ccp;
 
 	ccp = kmalloc(sizeof(*ccp), GFP_ATOMIC); // FIXME
-	if (!cpp)
+	if (!ccp)
 		return NULL;
 	memset(ccp, 0, sizeof(*ccp));
 	ccp->mru = 1524;      /* MRU, default 1524 */