Skip to content

Commit

Permalink
[PATCH] parport: move PP_MAJOR from ppdev.h to major.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rene Herman authored and Linus Torvalds committed Mar 25, 2006
1 parent 1efa646 commit e6a6784
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
3 changes: 2 additions & 1 deletion drivers/char/ppdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions include/linux/major.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@

#define UBD_MAJOR 98

#define PP_MAJOR 99
#define JSFD_MAJOR 99

#define PHONE_MAJOR 100
Expand Down
2 changes: 0 additions & 2 deletions include/linux/ppdev.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) */
Expand Down

0 comments on commit e6a6784

Please sign in to comment.