Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6a67846 authored by Rene Herman's avatar Rene Herman Committed by Linus Torvalds
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1efa6469

drivers/char/ppdev.c

+2 −1
Original line number Diff line number Diff line
@@ -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"

include/linux/major.h

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ 


#define UBD_MAJOR		98



#define PP_MAJOR		99

#define JSFD_MAJOR		99



#define PHONE_MAJOR		100

include/linux/ppdev.h

+0 −2
Original line number Diff line number Diff line
@@ -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) */