From 7206675c40394c78a90e74812bbdbf8cf3cca1be Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 25 Mar 1997 23:40:36 +0000
Subject: Import of Linux/MIPS 2.1.14.2

---
 drivers/block/ll_rw_blk.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'drivers/block/ll_rw_blk.c')

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();
-- 
cgit v1.2.3