[Linux-mips-commits] CVS: linux/arch/mips/lib ide-std.c,1.2,1.3

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/lib
In directory usw-pr-cvs1:/tmp/cvs-serv19784

Modified Files:
	ide-std.c 
Log Message:
Use ide_init_hwif_ports member of ide_ops structure.

Index: ide-std.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/lib/ide-std.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ide-std.c	2001/07/09 21:50:55	1.2
--- ide-std.c	2001/08/20 17:25:12	1.3
***************
*** 1,4 ****
! /* $Id$
!  *
   * This file is subject to the terms and conditions of the GNU General Public
   * License.  See the file "COPYING" in the main directory of this archive
--- 1,3 ----
! /*
   * This file is subject to the terms and conditions of the GNU General Public
   * License.  See the file "COPYING" in the main directory of this archive
***************
*** 7,13 ****
   * IDE routines for typical pc-like standard configurations.
   *
!  * Copyright (C) 1998, 1999 by Ralf Baechle
   */
- #include <linux/config.h>
  #include <linux/sched.h>
  #include <linux/ide.h>
--- 6,11 ----
   * IDE routines for typical pc-like standard configurations.
   *
!  * Copyright (C) 1998, 1999, 2001 by Ralf Baechle
   */
  #include <linux/sched.h>
  #include <linux/ide.h>
***************
*** 20,27 ****
  {
  #ifdef CONFIG_COBALT_MICRO_SERVER
! 	switch (base & 0x0fffffff) {
  #else
  	switch (base) {
- #endif
  		case 0x1f0: return 14;
  		case 0x170: return 15;
--- 18,24 ----
  {
  #ifdef CONFIG_COBALT_MICRO_SERVER
!        	switch (base & 0x0fffffff) {
  #else
  	switch (base) {
  		case 0x1f0: return 14;
  		case 0x170: return 15;
***************
*** 66,69 ****
--- 63,67 ----
  	if (irq != NULL)
  		*irq = 0;
+ 	hw->io_ports[IDE_IRQ_OFFSET] = 0;
  }