Commit 8bdf7c39 authored by Linus Torvalds's avatar Linus Torvalds

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

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
parents 1a731ce0 1f4d6e43
...@@ -2138,7 +2138,7 @@ request_mmio(struct resources *rs, unsigned long start, int len, ...@@ -2138,7 +2138,7 @@ request_mmio(struct resources *rs, unsigned long start, int len,
} }
void void
hisax_resources_release(struct IsdnCardState *cs) hisax_release_resources(struct IsdnCardState *cs)
{ {
resources_release(&cs->rs); resources_release(&cs->rs);
} }
......
...@@ -58,7 +58,7 @@ static struct pci_device_id fcpci_ids[] __devinitdata = { ...@@ -58,7 +58,7 @@ static struct pci_device_id fcpci_ids[] __devinitdata = {
}; };
MODULE_DEVICE_TABLE(pci, fcpci_ids); 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", { .id = "AVM0900",
.driver_data = (unsigned long) "Fritz!Card PnP", .driver_data = (unsigned long) "Fritz!Card PnP",
.devs = { { "AVM0900" } } } .devs = { { "AVM0900" } } }
......
...@@ -241,7 +241,7 @@ ippp_ccp_alloc(void) ...@@ -241,7 +241,7 @@ ippp_ccp_alloc(void)
struct ippp_ccp *ccp; struct ippp_ccp *ccp;
ccp = kmalloc(sizeof(*ccp), GFP_ATOMIC); // FIXME ccp = kmalloc(sizeof(*ccp), GFP_ATOMIC); // FIXME
if (!cpp) if (!ccp)
return NULL; return NULL;
memset(ccp, 0, sizeof(*ccp)); memset(ccp, 0, sizeof(*ccp));
ccp->mru = 1524; /* MRU, default 1524 */ ccp->mru = 1524; /* MRU, default 1524 */
......
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