Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / fs / char_dev.c

diff --git a/fs/char_dev.c b/fs/char_dev.c
index 78ced721554d8f855f3254ac052e15d8b248d47d..164a45cdaf5f96cd8e6ac92b617c0525f0aaf8ff 100644 (file)
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -109,8 +109,6 @@ __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;
                }