Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23

[linux-2.6] / drivers / s390 / cio / ioasm.h

diff --git a/drivers/s390/cio/ioasm.h b/drivers/s390/cio/ioasm.h
index 78c7db6daa845736ea451326b2c749996fef1e28..7153dd959082253eb00cb182a4b53bb59b2eb72f 100644 (file)
--- a/drivers/s390/cio/ioasm.h
+++ b/drivers/s390/cio/ioasm.h
@@ -1,8 +1,8 @@
 #ifndef S390_CIO_IOASM_H
 #define S390_CIO_IOASM_H
 
+#include <asm/chpid.h>
 #include "schid.h"
-#include "chpid.h"
 
 /*
  * TPI info structure