Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git

[linux-2.6] / drivers / atm / he.c

diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 7d9b4e52f0bf4c985f1766fe2f88c35c78ea6c32..db33f6f4dd2a5517302e22fc5575c43c1a28413e 100644 (file)
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -2351,7 +2351,7 @@ he_open(struct atm_vcc *vcc)
 
        cid = he_mkcid(he_dev, vpi, vci);
 
-       he_vcc = (struct he_vcc *) kmalloc(sizeof(struct he_vcc), GFP_ATOMIC);
+       he_vcc = kmalloc(sizeof(struct he_vcc), GFP_ATOMIC);
        if (he_vcc == NULL) {
                hprintk("unable to allocate he_vcc during open\n");
                return -ENOMEM;