sugar/linux
1
0
Fork 0
Code Activity

Merge with Linus' kernel.

Browse Source
This commit is contained in:
Russell King
2006-01-07 14:40:05 +00:00
committed by Russell King
parent a62c80e559 0aec63e67c
commit 123656d4cc
2145 changed files with 159913 additions and 65323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/pcmcia/pxa2xx_sharpsl.c
View File

@@ -264,11 +264,10 @@ static int __init sharpsl_pcmcia_init(void)
int ret;
sharpsl_pcmcia_ops.nr=platform_scoop_config->num_devs;
sharpsl_pcmcia_device = kmalloc(sizeof(*sharpsl_pcmcia_device), GFP_KERNEL);
sharpsl_pcmcia_device = kzalloc(sizeof(*sharpsl_pcmcia_device), GFP_KERNEL);
if (!sharpsl_pcmcia_device)
return -ENOMEM;
memset(sharpsl_pcmcia_device, 0, sizeof(*sharpsl_pcmcia_device));
sharpsl_pcmcia_device->name = "pxa2xx-pcmcia";
sharpsl_pcmcia_device->dev.platform_data = &sharpsl_pcmcia_ops;
sharpsl_pcmcia_device->dev.parent=platform_scoop_config->devs[0].dev;