diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
| commit | 0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3 (patch) | |
| tree | 92f55e374a84d06ce8213a4540454760fdecf137 /include/linux/parport.h | |
| parent | 8ef12c9f01afba47c2d33bb939085111ca0d0f7d (diff) | |
| parent | 5367f2d67c7d0bf1faae90e6e7b4e2ac3c9b5e0f (diff) | |
Merge Linus' tree.
Diffstat (limited to 'include/linux/parport.h')
| -rw-r--r-- | include/linux/parport.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/parport.h b/include/linux/parport.h index f7ff0b0c4031..f67f838a3a1f 100644 --- a/include/linux/parport.h +++ b/include/linux/parport.h | |||
| @@ -236,12 +236,14 @@ struct pardevice { | |||
| 236 | 236 | ||
| 237 | /* IEEE1284 information */ | 237 | /* IEEE1284 information */ |
| 238 | 238 | ||
| 239 | /* IEEE1284 phases */ | 239 | /* IEEE1284 phases. These are exposed to userland through ppdev IOCTL |
| 240 | * PP[GS]ETPHASE, so do not change existing values. */ | ||
| 240 | enum ieee1284_phase { | 241 | enum ieee1284_phase { |
| 241 | IEEE1284_PH_FWD_DATA, | 242 | IEEE1284_PH_FWD_DATA, |
| 242 | IEEE1284_PH_FWD_IDLE, | 243 | IEEE1284_PH_FWD_IDLE, |
| 243 | IEEE1284_PH_TERMINATE, | 244 | IEEE1284_PH_TERMINATE, |
| 244 | IEEE1284_PH_NEGOTIATION, | 245 | IEEE1284_PH_NEGOTIATION, |
| 246 | IEEE1284_PH_HBUSY_DNA, | ||
| 245 | IEEE1284_PH_REV_IDLE, | 247 | IEEE1284_PH_REV_IDLE, |
| 246 | IEEE1284_PH_HBUSY_DAVAIL, | 248 | IEEE1284_PH_HBUSY_DAVAIL, |
| 247 | IEEE1284_PH_REV_DATA, | 249 | IEEE1284_PH_REV_DATA, |