From c9c06167e7933d93a6e396174c68abf242294abb Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 10 Jan 2001 05:27:25 +0000
Subject: Merge with Linux 2.4.0-test12.

---
 include/asm-sparc/hdreg.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/asm-sparc/hdreg.h')

diff --git a/include/asm-sparc/hdreg.h b/include/asm-sparc/hdreg.h
index 1c321c3e7..8df7a4693 100644
--- a/include/asm-sparc/hdreg.h
+++ b/include/asm-sparc/hdreg.h
@@ -1,4 +1,4 @@
-/* $Id: hdreg.h,v 1.1 2000/01/21 04:56:27 zaitcev Exp $
+/* $Id: hdreg.h,v 1.2 2000/12/05 00:56:36 anton Exp $
  * hdreg.h: SPARC PCI specific IDE glue.
  *
  * Copyright (C) 1997  David S. Miller (davem@caip.rutgers.edu)
@@ -8,6 +8,6 @@
 #ifndef __SPARC_HDREG_H
 #define __SPARC_HDREG_H
 
-typedef unsigned int ide_ioreg_t;
+typedef unsigned long ide_ioreg_t;
 
 #endif /* __SPARC_HDREG_H */
-- 
cgit v1.2.3