diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
| commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
| tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /include/linux/rio_ids.h | |
| parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
Diffstat (limited to 'include/linux/rio_ids.h')
| -rw-r--r-- | include/linux/rio_ids.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/rio_ids.h b/include/linux/rio_ids.h index 919d4e07d54e..db50e1c288b7 100644 --- a/include/linux/rio_ids.h +++ b/include/linux/rio_ids.h | |||
| @@ -20,5 +20,19 @@ | |||
| 20 | 20 | ||
| 21 | #define RIO_VID_TUNDRA 0x000d | 21 | #define RIO_VID_TUNDRA 0x000d |
| 22 | #define RIO_DID_TSI500 0x0500 | 22 | #define RIO_DID_TSI500 0x0500 |
| 23 | #define RIO_DID_TSI568 0x0568 | ||
| 24 | #define RIO_DID_TSI572 0x0572 | ||
| 25 | #define RIO_DID_TSI574 0x0574 | ||
| 26 | #define RIO_DID_TSI576 0x0578 /* Same ID as Tsi578 */ | ||
| 27 | #define RIO_DID_TSI577 0x0577 | ||
| 28 | #define RIO_DID_TSI578 0x0578 | ||
| 29 | |||
| 30 | #define RIO_VID_IDT 0x0038 | ||
| 31 | #define RIO_DID_IDT70K200 0x0310 | ||
| 32 | #define RIO_DID_IDTCPS8 0x035c | ||
| 33 | #define RIO_DID_IDTCPS12 0x035d | ||
| 34 | #define RIO_DID_IDTCPS16 0x035b | ||
| 35 | #define RIO_DID_IDTCPS6Q 0x035f | ||
| 36 | #define RIO_DID_IDTCPS10Q 0x035e | ||
| 23 | 37 | ||
| 24 | #endif /* LINUX_RIO_IDS_H */ | 38 | #endif /* LINUX_RIO_IDS_H */ |