diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 00:55:14 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 00:55:14 -0400 |
| commit | 908cf4b925e419bc74f3297b2f0e51d6f8a81da2 (patch) | |
| tree | 6c2da79366d4695a9c2560ab18259eca8a2a25b4 /drivers/char/rio/riospace.h | |
| parent | 92c49890922d54cba4b1eadeb0b185773c2c9570 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'drivers/char/rio/riospace.h')
| -rw-r--r-- | drivers/char/rio/riospace.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/char/rio/riospace.h b/drivers/char/rio/riospace.h index 534f1f5b9f53..ffb31d4332b9 100644 --- a/drivers/char/rio/riospace.h +++ b/drivers/char/rio/riospace.h | |||
| @@ -33,10 +33,6 @@ | |||
| 33 | #ifndef __rio_riospace_h__ | 33 | #ifndef __rio_riospace_h__ |
| 34 | #define __rio_riospace_h__ | 34 | #define __rio_riospace_h__ |
| 35 | 35 | ||
| 36 | #ifdef SCCS_LABELS | ||
| 37 | static char *_riospace_h_sccs_ = "@(#)riospace.h 1.2"; | ||
| 38 | #endif | ||
| 39 | |||
| 40 | #define RIO_LOCATOR_LEN 16 | 36 | #define RIO_LOCATOR_LEN 16 |
| 41 | #define MAX_RIO_BOARDS 4 | 37 | #define MAX_RIO_BOARDS 4 |
| 42 | 38 | ||