summaryrefslogtreecommitdiff
path: root/include/linux/blk.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 18:11:38 -0800
committerLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 18:11:38 -0800
commit1a0153507ffae9cf3350e76c12d441788c0191e1 (patch)
treed05a502b4fc05202c84c1667019460c08ea088cd /include/linux/blk.h
parentb0683ac8928c4cf40646a6ce3eb6ffe94605acfa (diff)
v2.4.3.2 -> v2.4.3.3
- Hui-Fen Hsu: sis900 driver update - NIIBE Yutaka: Super-H update - Alan Cox: more resyncs (ARM down, but more to go) - David Miller: network zerocopy, Sparc sync, qlogic,FC fix, etc. - David Miller/me: get rid of various drivers hacks to do mmap alignment behind the back of the VM layer. Create a real protocol for it.
Diffstat (limited to 'include/linux/blk.h')
-rw-r--r--include/linux/blk.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blk.h b/include/linux/blk.h
index 3f9c707c7d01..f9ac09edbcd4 100644
--- a/include/linux/blk.h
+++ b/include/linux/blk.h
@@ -42,7 +42,6 @@ extern int swim3_init(void);
extern int swimiop_init(void);
extern int amiga_floppy_init(void);
extern int atari_floppy_init(void);
-extern int nbd_init(void);
extern int ez_init(void);
extern int bpcd_init(void);
extern int ps2esdi_init(void);
@@ -51,6 +50,7 @@ extern int jsfd_init(void);
#if defined(CONFIG_ARCH_S390)
extern int mdisk_init(void);
extern int dasd_init(void);
+extern int xpram_init(void);
#endif /* CONFIG_ARCH_S390 */
extern void set_device_ro(kdev_t dev,int flag);