[PATCH] parport: move PP_MAJOR from ppdev.h to major.h

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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 306ee0f091a4eb6e3920f5cea458b9a616b6ac59..bee6c47b45bdd162e33e50e32171667dd6df8df8 100644 (file)
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -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 --git a/include/linux/major.h b/include/linux/major.h
index e36a46702d9411085773744b46e6afc45728618f..0a74c52924c9d60e6feb8668b4cbf3b1046d7dc3 100644 (file)
--- a/include/linux/major.h
+++ b/include/linux/major.h
@@ -113,6 +113,7 @@
 
 #define UBD_MAJOR              98
 
+#define PP_MAJOR               99
 #define JSFD_MAJOR             99
 
 #define PHONE_MAJOR            100

diff --git a/include/linux/ppdev.h b/include/linux/ppdev.h
index 141c96586824b4e8404ddee8e2d8ca64e5985c8c..f376a7598a782139affd060cd36323df7306c54d 100644 (file)
--- a/include/linux/ppdev.h
+++ b/include/linux/ppdev.h
@@ -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) */