X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=fs%2Fchar_dev.c;h=e6194e2b9bb9cbf39c9c85f23d346d55716293a1;hb=70456600f42f85cfcbdd9d7a6029c03b6f9c5d1e;hp=a885f46ca001f117a9b8bc3bd4ac0e140b5c9e3e;hpb=f0eef25339f92f7cd4aeea23d9ae97987a5a1e82;p=linux-2.6-omap-h63xx.git

diff --git a/fs/char_dev.c b/fs/char_dev.c
index a885f46ca00..e6194e2b9bb 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -108,6 +108,13 @@ __register_chrdev_region(unsigned int major, unsigned int baseminor,
 	/* temporary */
 	if (major == 0) {
 		for (i = ARRAY_SIZE(chrdevs)-1; i > 0; i--) {
+			/*
+			 * Disallow the LANANA-assigned LOCAL/EXPERIMENTAL
+			 * majors
+			 */
+			if ((60 <= i && i <= 63) || (120 <= i && i <= 127) ||
+					(240 <= i && i <= 254))
+				continue;
 			if (chrdevs[i] == NULL)
 				break;
 		}