From: Dave Boutcher <sleddog@us.ibm.com>

fix naming collision with asm-ppc64/vio.h. The define would be set there and
this file would not get pulled in.


---

 include/asm-ppc64/iSeries/vio.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -puN include/asm-ppc64/iSeries/vio.h~ppc64-vio-header include/asm-ppc64/iSeries/vio.h
--- 25/include/asm-ppc64/iSeries/vio.h~ppc64-vio-header	2004-02-21 20:58:22.000000000 -0800
+++ 25-akpm/include/asm-ppc64/iSeries/vio.h	2004-02-21 20:58:22.000000000 -0800
@@ -38,8 +38,8 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#ifndef _VIO_H
-#define _VIO_H
+#ifndef _ISERIES_VIO_H
+#define _ISERIES_VIO_H
 
 #include <asm/iSeries/HvTypes.h>
 #include <asm/iSeries/HvLpEvent.h>
@@ -127,4 +127,4 @@ enum viorc {
 	viorc_openRejected = 0x0301
 };
 
-#endif /* _VIO_H */
+#endif /* _ISERIES_VIO_H */

_