Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[pandora-kernel.git] / include / asm-powerpc / keylargo.h

diff --git a/include/asm-powerpc/keylargo.h b/include/asm-powerpc/keylargo.h
index 334d4c9..d8520ef 100644 (file)
--- a/include/asm-powerpc/keylargo.h
+++ b/include/asm-powerpc/keylargo.h
@@ -1,3 +1,6 @@
+#ifndef _ASM_POWERPC_KEYLARGO_H
+#define _ASM_POWERPC_KEYLARGO_H
+#ifdef __KERNEL__
 /*
  * keylargo.h: definitions for using the "KeyLargo" I/O controller chip.
  *
@@ -254,3 +257,5 @@
 #define SH_FCR1_I2S2_ENABLE            0x00000080
 #define SH_FCR3_I2S2_CLK18_ENABLE      0x00008000
 
+#endif /* __KERNEL__ */
+#endif /* _ASM_POWERPC_KEYLARGO_H */