Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6-omap-h63xx.git] / drivers / cdrom / cm206.c

diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c
index e6d8e9ededeaeb57e562e84ad5987f89c8262f0c..b6c61bbb20e135adbba310b0d4f7cb5ea54d41d8 100644 (file)
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
@@ -1420,7 +1420,7 @@ int __init cm206_init(void)
                return -EIO;
        }
        printk(" adapter at 0x%x", cm206_base);
-       cd = (struct cm206_struct *) kmalloc(size, GFP_KERNEL);
+       cd = kmalloc(size, GFP_KERNEL);
        if (!cd)
                goto out_base;
        /* Now we have found the adaptor card, try to reset it. As we have