Commit 41b592ca authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] fix naming collision with asm-ppc64/vio.h

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.
parent 153c36fc
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
#ifndef _VIO_H #ifndef _ISERIES_VIO_H
#define _VIO_H #define _ISERIES_VIO_H
#include <asm/iSeries/HvTypes.h> #include <asm/iSeries/HvTypes.h>
#include <asm/iSeries/HvLpEvent.h> #include <asm/iSeries/HvLpEvent.h>
...@@ -127,4 +127,4 @@ enum viorc { ...@@ -127,4 +127,4 @@ enum viorc {
viorc_openRejected = 0x0301 viorc_openRejected = 0x0301
}; };
#endif /* _VIO_H */ #endif /* _ISERIES_VIO_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment