summaryrefslogtreecommitdiffstats
path: root/include/pcmcia
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-11-23 02:00:47 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-11-23 02:00:47 +0000
commit06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch)
tree8766f208847d4876a6db619aebbf54d53b76eb44 /include/pcmcia
parentfa9bdb574f4febb751848a685d9a9017e04e1d53 (diff)
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'include/pcmcia')
-rw-r--r--include/pcmcia/version.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/pcmcia/version.h b/include/pcmcia/version.h
index 70f3d8a48..eb88263fc 100644
--- a/include/pcmcia/version.h
+++ b/include/pcmcia/version.h
@@ -1,4 +1,4 @@
-/* version.h 1.92 2000/07/21 18:26:56 (David Hinds) */
+/* version.h 1.94 2000/10/03 17:55:48 (David Hinds) */
-#define CS_RELEASE "3.1.20"
-#define CS_RELEASE_CODE 0x3115
+#define CS_RELEASE "3.1.22"
+#define CS_RELEASE_CODE 0x3116