Commit d8a33496 authored by Marko Kohtala's avatar Marko Kohtala Committed by Linus Torvalds

[PATCH] parport: bring back an unused phase for ppdev ioctl

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: default avatarMarko Kohtala <marko.kohtala@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d1c4ac40
...@@ -236,12 +236,14 @@ struct pardevice { ...@@ -236,12 +236,14 @@ struct pardevice {
/* IEEE1284 information */ /* 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 { enum ieee1284_phase {
IEEE1284_PH_FWD_DATA, IEEE1284_PH_FWD_DATA,
IEEE1284_PH_FWD_IDLE, IEEE1284_PH_FWD_IDLE,
IEEE1284_PH_TERMINATE, IEEE1284_PH_TERMINATE,
IEEE1284_PH_NEGOTIATION, IEEE1284_PH_NEGOTIATION,
IEEE1284_PH_HBUSY_DNA,
IEEE1284_PH_REV_IDLE, IEEE1284_PH_REV_IDLE,
IEEE1284_PH_HBUSY_DAVAIL, IEEE1284_PH_HBUSY_DAVAIL,
IEEE1284_PH_REV_DATA, IEEE1284_PH_REV_DATA,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment