---

yaml --- r: 23540 b: refs/heads/master c: e6a6784 h: refs/heads/master v: v3
git-mirror · Mar 25, 2006 · 3fd9f4f · 3fd9f4f
1 parent adc1db1
commit 3fd9f4f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1efa64696bc55cc396eefa9838a90d106dfab6bf
+refs/heads/master: e6a6784627483381d012b507bb0d49809658a1fa
diff --git a/trunk/drivers/char/ppdev.c b/trunk/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/trunk/include/linux/major.h b/trunk/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/trunk/include/linux/ppdev.h b/trunk/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) */