diff options
| author | Greg KH <greg@press.(none)> | 2005-06-28 01:07:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-28 01:07:56 -0400 |
| commit | 8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (patch) | |
| tree | c43b6c2fdf1b68b66906a2de69446dcec0f9af6b /include/pcmcia/ciscode.h | |
| parent | 1cde8a16815bd85c8137d1ea556398983c597c11 (diff) | |
| parent | 99f95e5286df2f69edab8a04c7080d986ee4233b (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/pcmcia/ciscode.h')
| -rw-r--r-- | include/pcmcia/ciscode.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/pcmcia/ciscode.h b/include/pcmcia/ciscode.h index 2000b43ece91..da19c297dd65 100644 --- a/include/pcmcia/ciscode.h +++ b/include/pcmcia/ciscode.h | |||
| @@ -112,6 +112,8 @@ | |||
| 112 | 112 | ||
| 113 | #define MANFID_TDK 0x0105 | 113 | #define MANFID_TDK 0x0105 |
| 114 | #define PRODID_TDK_CF010 0x0900 | 114 | #define PRODID_TDK_CF010 0x0900 |
| 115 | #define PRODID_TDK_NP9610 0x0d0a | ||
| 116 | #define PRODID_TDK_MN3200 0x0e0a | ||
| 115 | #define PRODID_TDK_GN3410 0x4815 | 117 | #define PRODID_TDK_GN3410 0x4815 |
| 116 | 118 | ||
| 117 | #define MANFID_TOSHIBA 0x0098 | 119 | #define MANFID_TOSHIBA 0x0098 |