Pull bugzilla-6859 into release branch

[powerpc.git] / fs / char_dev.c

diff --git a/fs/char_dev.c b/fs/char_dev.c
index a885f46..78ced72 100644 (file)
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -6,6 +6,7 @@
 
 #include <linux/init.h>
 #include <linux/fs.h>
+#include <linux/kdev_t.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 
@@ -108,6 +109,8 @@ __register_chrdev_region(unsigned int major, unsigned int baseminor,
        /* temporary */
        if (major == 0) {
                for (i = ARRAY_SIZE(chrdevs)-1; i > 0; i--) {
+                       if (is_lanana_major(i))
+                               continue;
                        if (chrdevs[i] == NULL)
                                break;
                }