summaryrefslogtreecommitdiffstats
path: root/drivers/block/ll_rw_blk.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-03-25 23:40:36 +0000
committer <ralf@linux-mips.org>1997-03-25 23:40:36 +0000
commit7206675c40394c78a90e74812bbdbf8cf3cca1be (patch)
tree251895cf5a0008e2b4ce438cb01ad4d55fb5b97b /drivers/block/ll_rw_blk.c
parentbeb116954b9b7f3bb56412b2494b562f02b864b1 (diff)
Import of Linux/MIPS 2.1.14.2
Diffstat (limited to 'drivers/block/ll_rw_blk.c')
-rw-r--r--drivers/block/ll_rw_blk.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
index e7ad12604..bc2206737 100644
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@ -3,7 +3,6 @@
*
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 1994, Karl Keyte: Added support for disk statistics
- * Copyright (C) 1996, ACN S.A: Added support for flash devices
*/
/*
@@ -650,10 +649,9 @@ int blk_dev_init(void)
#ifdef CONFIG_BLK_DEV_FD
floppy_init();
#else
+#ifndef CONFIG_SGI
outb_p(0xc, 0x3f2);
#endif
-#ifdef CONFIG_ACN_MIPS_BOARD
- flash_devs_init();
#endif
#ifdef CONFIG_CDU31A
cdu31a_init();