tridentfb: convert is_blade and is_xp macros into functions

[safe/jmp/linux-2.6] / include / asm-s390 / chpid.h

diff --git a/include/asm-s390/chpid.h b/include/asm-s390/chpid.h
index 606844d..dfe3c7f 100644 (file)
--- a/include/asm-s390/chpid.h
+++ b/include/asm-s390/chpid.h
@@ -20,6 +20,9 @@ struct chp_id {
        u8 id;
 } __attribute__((packed));
 
+#ifdef __KERNEL__
+#include <asm/cio.h>
+
 static inline void chp_id_init(struct chp_id *chpid)
 {
        memset(chpid, 0, sizeof(struct chp_id));
@@ -40,9 +43,6 @@ static inline void chp_id_next(struct chp_id *chpid)
        }
 }
 
-#ifdef __KERNEL__
-#include <asm/cio.h>
-
 static inline int chp_id_is_valid(struct chp_id *chpid)
 {
        return (chpid->cssid <= __MAX_CSSID);