diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
| commit | 482368b1a8e45430672c58c9a42e7d2004367126 (patch) | |
| tree | ce2a1a567d4d62dee7c2e71a46a99cf72cf1d606 /include/pcmcia | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'include/pcmcia')
| -rw-r--r-- | include/pcmcia/ciscode.h | 4 | ||||
| -rw-r--r-- | include/pcmcia/ss.h | 3 | ||||
| -rw-r--r-- | include/pcmcia/version.h | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/include/pcmcia/ciscode.h b/include/pcmcia/ciscode.h index 904fba0b8..e5c328054 100644 --- a/include/pcmcia/ciscode.h +++ b/include/pcmcia/ciscode.h @@ -1,5 +1,5 @@ /* - * ciscode.h 1.39 1999/10/25 20:23:17 + * ciscode.h 1.40 2000/02/01 19:06:40 * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in @@ -91,6 +91,8 @@ #define PRODID_OSITECH_JACK_336 0x0007 #define PRODID_OSITECH_SEVEN 0x0008 +#define MANFID_PIONEER 0x000b + #define MANFID_PSION 0x016c #define MANFID_QUATECH 0x0137 diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index fb3819ba8..b53657fad 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h @@ -1,5 +1,5 @@ /* - * ss.h 1.25 1999/10/25 20:23:17 + * ss.h 1.26 2000/02/04 20:35:21 * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in @@ -45,6 +45,7 @@ #define SS_CARDBUS 0x0800 #define SS_3VCARD 0x1000 #define SS_XVCARD 0x2000 +#define SS_PENDING 0x4000 /* for InquireSocket */ typedef struct socket_cap_t { diff --git a/include/pcmcia/version.h b/include/pcmcia/version.h index 4606b40b3..4f6ffc702 100644 --- a/include/pcmcia/version.h +++ b/include/pcmcia/version.h @@ -1,4 +1,4 @@ -/* version.h 1.81 1999/12/23 21:37:32 (David Hinds) */ +/* version.h 1.83 2000/02/03 02:16:14 (David Hinds) */ -#define CS_RELEASE "3.1.9" -#define CS_RELEASE_CODE 0x3109 +#define CS_RELEASE "3.1.11" +#define CS_RELEASE_CODE 0x310b |