From: Rene Herman <rene.herman@keyaccess.nl>
Date: Sat, 25 Mar 2006 11:07:13 +0000 (-0800)
Subject: [PATCH] parport: move PP_MAJOR from ppdev.h to major.h
X-Git-Tag: v2.6.17-rc1~821
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e6a6784627483381d012b507bb0d49809658a1fa;p=linux-2.6-omap-h63xx.git

[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 306ee0f091a..bee6c47b45b 100644
--- 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 e36a46702d9..0a74c52924c 100644
--- 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 141c9658682..f376a7598a7 100644
--- 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) */