Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / include / pcmcia / ciscode.h

diff --git a/include/pcmcia/ciscode.h b/include/pcmcia/ciscode.h
index 2000b43ece9184161a632d0c16e30eecc7abcdf5..c1da8558339a266e7c1d0fecf7c20c22379edd44 100644 (file)
--- a/include/pcmcia/ciscode.h
+++ b/include/pcmcia/ciscode.h
@@ -1,5 +1,5 @@
 /*
- * ciscode.h -- Definitions for bulk memory services
+ * ciscode.h
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -112,6 +112,8 @@
 
 #define MANFID_TDK                     0x0105
 #define PRODID_TDK_CF010               0x0900
+#define PRODID_TDK_NP9610              0x0d0a
+#define PRODID_TDK_MN3200              0x0e0a
 #define PRODID_TDK_GN3410              0x4815
 
 #define MANFID_TOSHIBA                 0x0098
@@ -120,4 +122,7 @@
 
 #define MANFID_XIRCOM                  0x0105
 
+#define MANFID_POSSIO                  0x030c
+#define PRODID_POSSIO_GCC              0x0003
+
 #endif /* _LINUX_CISCODE_H */