From: Marko Kohtala Earlier fix removed unused phase, but that changed the values for other phases. Since these are exposed to userspace through ppdev, it is safer not to change them. Restore the unused phase value. Signed-off-by: Marko Kohtala Signed-off-by: Andrew Morton --- include/linux/parport.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) diff -puN include/linux/parport.h~parport-bring-back-an-unused-phase-for-ppdev-ioctl include/linux/parport.h --- devel/include/linux/parport.h~parport-bring-back-an-unused-phase-for-ppdev-ioctl 2006-01-06 22:38:56.000000000 -0800 +++ devel-akpm/include/linux/parport.h 2006-01-06 22:38:56.000000000 -0800 @@ -236,12 +236,14 @@ struct pardevice { /* IEEE1284 information */ -/* IEEE1284 phases */ +/* IEEE1284 phases. These are exposed to userland through ppdev IOCTL + * PP[GS]ETPHASE, so do not change existing values. */ enum ieee1284_phase { IEEE1284_PH_FWD_DATA, IEEE1284_PH_FWD_IDLE, IEEE1284_PH_TERMINATE, IEEE1284_PH_NEGOTIATION, + IEEE1284_PH_HBUSY_DNA, IEEE1284_PH_REV_IDLE, IEEE1284_PH_HBUSY_DAVAIL, IEEE1284_PH_REV_DATA, _