patch-2.1.17 linux/include/linux/blk.h

Next file: linux/include/linux/hdlcdrv.h
Previous file: linux/include/asm-sparc/unistd.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.16/linux/include/linux/blk.h linux/include/linux/blk.h
@@ -40,6 +40,9 @@
 #ifdef CONFIG_CDU31A
 extern int cdu31a_init(void);
 #endif CONFIG_CDU31A
+#ifdef CONFIG_ATARI_ACSI
+extern int acsi_init(void);
+#endif CONFIG_ATARI_ACSI
 #ifdef CONFIG_MCD
 extern int mcd_init(void);
 #endif CONFIG_MCD
@@ -85,6 +88,15 @@
 #ifdef CONFIG_BLK_DEV_MD
 extern int md_init(void);
 #endif CONFIG_BLK_DEV_MD
+#ifdef CONFIG_APBLOCK
+extern int ap_init(void);
+#endif
+#ifdef CONFIG_DDV
+extern int ddv_init(void);
+#endif
+#ifdef CONFIG_AMIGA_Z2RAM
+extern int z2_init(void);
+#endif
 
 extern void set_device_ro(kdev_t dev,int flag);
 void add_blkdev_randomness(int major);
@@ -102,6 +114,7 @@
 
 extern unsigned long initrd_start,initrd_end;
 extern int mount_initrd; /* zero if initrd should not be mounted */
+extern int initrd_below_start_ok; /* 1 if it is not an error if initrd_start < memory_start */
 void initrd_init(void);
 
 #endif
@@ -138,6 +151,15 @@
 #define DEVICE_OFF(device)
 #define DEVICE_NO_RANDOM
 
+#elif (MAJOR_NR == Z2RAM_MAJOR)
+
+/* Zorro II Ram */
+#define DEVICE_NAME "Z2RAM"
+#define DEVICE_REQUEST do_z2_request
+#define DEVICE_NR(device) (MINOR(device))
+#define DEVICE_ON(device)
+#define DEVICE_OFF(device)
+
 #elif (MAJOR_NR == FLOPPY_MAJOR)
 
 static void floppy_off(unsigned int nr);
@@ -221,6 +243,15 @@
 #define DEVICE_ON(device)
 #define DEVICE_OFF(device)
 
+#elif (MAJOR_NR == ACSI_MAJOR) && (defined(CONFIG_ATARI_ACSI) || defined(CONFIG_ATARI_ACSI_MODULE))
+
+#define DEVICE_NAME "ACSI"
+#define DEVICE_INTR do_acsi
+#define DEVICE_REQUEST do_acsi_request
+#define DEVICE_NR(device) (MINOR(device) >> 4)
+#define DEVICE_ON(device)
+#define DEVICE_OFF(device)
+
 #elif (MAJOR_NR == MITSUMI_CDROM_MAJOR)
 
 #define DEVICE_NAME "Mitsumi CD-ROM"
@@ -317,6 +348,22 @@
 #define DEVICE_REQUEST do_sjcd_request
 #define DEVICE_NR(device) (MINOR(device))
 #define DEVICE_ON(device)
+#define DEVICE_OFF(device)
+
+#elif (MAJOR_NR == APBLOCK_MAJOR)
+
+#define DEVICE_NAME "apblock"
+#define DEVICE_REQUEST ap_request
+#define DEVICE_NR(device) (MINOR(device))
+#define DEVICE_ON(device) 
+#define DEVICE_OFF(device)
+
+#elif (MAJOR_NR == DDV_MAJOR)
+
+#define DEVICE_NAME "ddv"
+#define DEVICE_REQUEST ddv_request
+#define DEVICE_NR(device) (MINOR(device)>>PARTN_BITS)
+#define DEVICE_ON(device) 
 #define DEVICE_OFF(device)
 
 #endif /* MAJOR_NR == whatever */

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