Merge to Fedora kernel-2.6.7-1.441

[linux-2.6.git] / include / asm-arm / arch-omap / uncompress.h

diff --git a/include/asm-arm/arch-omap/uncompress.h b/include/asm-arm/arch-omap/uncompress.h
index f0b82d3..9b28736 100644 (file)
--- a/include/asm-arm/arch-omap/uncompress.h
+++ b/include/asm-arm/arch-omap/uncompress.h
@@ -25,7 +25,7 @@
 
 #define UART_OMAP_MDR1         0x08    /* mode definition register */
 #define check_port(base, shift) ((base[UART_OMAP_MDR1 << shift] & 7) == 0)
-#define omap_get_id() ((*(volatile unsigned int *)(0xfffed404)) >> 12) & 0xffff
+#define omap_get_id() ((*(volatile unsigned int *)(0xfffed404)) >> 12) & ID_MASK
 
 static void
 puts(const char *s)