Merge commit 'kumar/next' into next

[pandora-kernel.git] / include / linux / eisa.h

diff --git a/include/linux/eisa.h b/include/linux/eisa.h
index fe806b6..e61c0be 100644 (file)
--- a/include/linux/eisa.h
+++ b/include/linux/eisa.h
@@ -40,7 +40,7 @@ struct eisa_device {
        u64                   dma_mask;
        struct device         dev; /* generic device */
 #ifdef CONFIG_EISA_NAMES
-       char                  pretty_name[DEVICE_NAME_SIZE];
+       char                  pretty_name[50];
 #endif
 };