Merge branch 'release' of master.kernel.org:/home/ftp/pub/scm/linux/kernel/git/aegl...

[linux-2.6-omap-h63xx.git] / drivers / char / consolemap.c

diff --git a/drivers/char/consolemap.c b/drivers/char/consolemap.c
index 04a12027a740a57dea956fd3abbba1785739500e..b99b7561260dca1eeea4472bb95f3a087c9f688a 100644 (file)
--- a/drivers/char/consolemap.c
+++ b/drivers/char/consolemap.c
@@ -443,7 +443,7 @@ int con_clear_unimap(struct vc_data *vc, struct unimapinit *ui)
        p = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
        if (p && p->readonly) return -EIO;
        if (!p || --p->refcount) {
-               q = (struct uni_pagedir *)kmalloc(sizeof(*p), GFP_KERNEL);
+               q = kmalloc(sizeof(*p), GFP_KERNEL);
                if (!q) {
                        if (p) p->refcount++;
                        return -ENOMEM;