From: Rene Herman <rene.herman@keyaccess.nl>

Today I wondered about /dev/parport<n> after not seeing anything in
drivers/parport register char-major-99.  Having PP_MAJOR in
include/linux/major.h would've allowed me to more quickly determine that it
was the ppdev driver driving these.

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/char/ppdev.c  |    3 ++-
 include/linux/major.h |    1 +
 include/linux/ppdev.h |    2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff -puN drivers/char/ppdev.c~move-pp_major-from-ppdevh-to-majorh drivers/char/ppdev.c
--- devel/drivers/char/ppdev.c~move-pp_major-from-ppdevh-to-majorh	2006-02-27 17:25:12.000000000 -0800
+++ devel-akpm/drivers/char/ppdev.c	2006-02-27 17:25:12.000000000 -0800
@@ -65,10 +65,11 @@
 #include <linux/parport.h>
 #include <linux/ctype.h>
 #include <linux/poll.h>
-#include <asm/uaccess.h>
+#include <linux/major.h>
 #include <linux/ppdev.h>
 #include <linux/smp_lock.h>
 #include <linux/device.h>
+#include <asm/uaccess.h>
 
 #define PP_VERSION "ppdev: user-space parallel port driver"
 #define CHRDEV "ppdev"
diff -puN include/linux/major.h~move-pp_major-from-ppdevh-to-majorh include/linux/major.h
--- devel/include/linux/major.h~move-pp_major-from-ppdevh-to-majorh	2006-02-27 17:25:12.000000000 -0800
+++ devel-akpm/include/linux/major.h	2006-02-27 17:25:12.000000000 -0800
@@ -113,6 +113,7 @@
 
 #define UBD_MAJOR		98
 
+#define PP_MAJOR		99
 #define JSFD_MAJOR		99
 
 #define PHONE_MAJOR		100
diff -puN include/linux/ppdev.h~move-pp_major-from-ppdevh-to-majorh include/linux/ppdev.h
--- devel/include/linux/ppdev.h~move-pp_major-from-ppdevh-to-majorh	2006-02-27 17:25:12.000000000 -0800
+++ devel-akpm/include/linux/ppdev.h	2006-02-27 17:25:12.000000000 -0800
@@ -14,8 +14,6 @@
  * Added PPGETMODES/PPGETMODE/PPGETPHASE, Fred Barnes <frmb2@ukc.ac.uk>, 03/01/2001
  */
 
-#define PP_MAJOR	99
-
 #define PP_IOCTL	'p'
 
 /* Set mode for read/write (e.g. IEEE1284_MODE_EPP) */
_