patch-2.1.106 linux/include/linux/zorro.h

Next file: linux/include/net/tcp.h
Previous file: linux/include/linux/vmalloc.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.105/linux/include/linux/zorro.h linux/include/linux/zorro.h
@@ -87,7 +87,7 @@
 #define ZORRO_ID(manuf, prod, epc) \
     ((ZORRO_MANUF_##manuf << 16) | ((prod) << 8) | (epc))
 
-typedef u32 zorro_id;
+typedef __u32 zorro_id;
 
 
 #define ZORRO_MANUF_PACIFIC_PERIPHERALS				0x00D3
@@ -462,6 +462,9 @@
 #define ZORRO_MANUF_ARMAX					0x0885
 #define  ZORRO_PROD_ARMAX_OMNIBUS				ZORRO_ID(ARMAX, 0x00, 0)
 
+#define ZORRO_MANUF_ZEUS					0x088d
+#define  ZORRO_PROD_ZEUS_SPIDER					ZORRO_ID(ZEUS, 0x04, 0)
+
 #define ZORRO_MANUF_NEWTEK					0x088F
 #define  ZORRO_PROD_NEWTEK_VIDEOTOASTER				ZORRO_ID(NEWTEK, 0x00, 0)
 
@@ -558,6 +561,7 @@
 #define  ZORRO_PROD_PHASE5_CYBERVISION64_3D_PROTOTYPE		ZORRO_ID(PHASE5, 0x32, 0)
 #define  ZORRO_PROD_PHASE5_CYBERVISION64_3D			ZORRO_ID(PHASE5, 0x43, 0)
 #define  ZORRO_PROD_PHASE5_CYBERSTORM_MK_III			ZORRO_ID(PHASE5, 0x64, 0)
+#define  ZORRO_PROD_PHASE5_BLIZZARD_603E_PLUS			ZORRO_ID(PHASE5, 0x6e, 0)
 
 #define ZORRO_MANUF_DPS						0x2169
 #define  ZORRO_PROD_DPS_PERSONAL_ANIMATION_RECORDER		ZORRO_ID(DPS, 0x01, 0)
@@ -576,6 +580,9 @@
 
 #define ZORRO_MANUF_UWE_GERLACH					0x3FF7
 #define  ZORRO_PROD_UWE_GERLACH_RAM_ROM				ZORRO_ID(UWE_GERLACH, 0xd4, 0)
+
+#define ZORRO_MANUF_ACT						0x4231
+#define  ZORRO_PROD_ACT_PRELUDE					ZORRO_ID(ACT, 0x01, 0)
 
 #define ZORRO_MANUF_MACROSYSTEMS_GERMANY			0x4754
 #define  ZORRO_PROD_MACROSYSTEMS_MAESTRO			ZORRO_ID(MACROSYSTEMS_GERMANY, 0x03, 0)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov