Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[sfrench/cifs-2.6.git] / arch / arm / plat-omap / include / mach / board-apollon.h

diff --git a/arch/arm/plat-omap/include/mach/board-apollon.h b/arch/arm/plat-omap/include/mach/board-apollon.h
index 731c858cf3fe70e836a9fbead02bee5ed7bfb5fa..61bd5e8f09b138f5c414b69b27ce0c51273fb9f9 100644 (file)
--- a/arch/arm/plat-omap/include/mach/board-apollon.h
+++ b/arch/arm/plat-omap/include/mach/board-apollon.h
@@ -29,12 +29,14 @@
 #ifndef __ASM_ARCH_OMAP_APOLLON_H
 #define __ASM_ARCH_OMAP_APOLLON_H
 
+#include <mach/cpu.h>
+
 extern void apollon_mmc_init(void);
 
 static inline int apollon_plus(void)
 {
        /* The apollon plus has IDCODE revision 5 */
-       return system_rev & 0xc0;
+       return omap_rev() & 0xc0;
 }
 
 /* Placeholder for APOLLON specific defines */