Merge branch 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mv-sheeva.git] / drivers / staging / vme / devices / vme_user.c

diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
index 78912883d1533d38e6c085b651cd09c4615e1444..e228942ee081deec0e705c67605d015b301e8a4e 100644 (file)
--- a/drivers/staging/vme/devices/vme_user.c
+++ b/drivers/staging/vme/devices/vme_user.c
@@ -31,7 +31,6 @@
 #include <linux/spinlock.h>
 #include <linux/syscalls.h>
 #include <linux/types.h>
-#include <linux/version.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -625,7 +624,7 @@ err_nocard:
 static int __init vme_user_probe(struct device *dev, int cur_bus, int cur_slot)
 {
        int i, err;
-       char name[8];
+       char name[12];
 
        /* Save pointer to the bridge device */
        if (vme_user_bridge != NULL) {