diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /include/linux/parport.h | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'include/linux/parport.h')
| -rw-r--r-- | include/linux/parport.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/parport.h b/include/linux/parport.h index d2a4d9e1e6d1..f7ff0b0c4031 100644 --- a/include/linux/parport.h +++ b/include/linux/parport.h | |||
| @@ -242,7 +242,6 @@ enum ieee1284_phase { | |||
| 242 | IEEE1284_PH_FWD_IDLE, | 242 | IEEE1284_PH_FWD_IDLE, |
| 243 | IEEE1284_PH_TERMINATE, | 243 | IEEE1284_PH_TERMINATE, |
| 244 | IEEE1284_PH_NEGOTIATION, | 244 | IEEE1284_PH_NEGOTIATION, |
| 245 | IEEE1284_PH_HBUSY_DNA, | ||
| 246 | IEEE1284_PH_REV_IDLE, | 245 | IEEE1284_PH_REV_IDLE, |
| 247 | IEEE1284_PH_HBUSY_DAVAIL, | 246 | IEEE1284_PH_HBUSY_DAVAIL, |
| 248 | IEEE1284_PH_REV_DATA, | 247 | IEEE1284_PH_REV_DATA, |