diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
| commit | 85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch) | |
| tree | 7bb15ada5f536950efa23ad60ea9eea60380ca1c /drivers/char/rio/protsts.h | |
| parent | a300bec952127d9a15e666b391bb35c9aecb3002 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'drivers/char/rio/protsts.h')
| -rw-r--r-- | drivers/char/rio/protsts.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/char/rio/protsts.h b/drivers/char/rio/protsts.h index 69fc4bc34153..8ab79401d3ee 100644 --- a/drivers/char/rio/protsts.h +++ b/drivers/char/rio/protsts.h | |||
| @@ -37,13 +37,6 @@ | |||
| 37 | #ifndef _protsts_h | 37 | #ifndef _protsts_h |
| 38 | #define _protsts_h 1 | 38 | #define _protsts_h 1 |
| 39 | 39 | ||
| 40 | |||
| 41 | #ifdef SCCS_LABELS | ||
| 42 | #ifndef lint | ||
| 43 | /* static char *_rio_protsts_h_sccs = "@(#)protsts.h 1.4"; */ | ||
| 44 | #endif | ||
| 45 | #endif | ||
| 46 | |||
| 47 | /************************************************* | 40 | /************************************************* |
| 48 | * ACK bit. Last Packet received OK. Set by | 41 | * ACK bit. Last Packet received OK. Set by |
| 49 | * rxpkt to indicate that the Packet has been | 42 | * rxpkt to indicate that the Packet has been |