Merge branch 'u-boot/master'

[u-boot] / arch / arm / cpu / arm926ejs / omap / cpuinfo.c

diff --git a/arch/arm/cpu/arm926ejs/omap/cpuinfo.c b/arch/arm/cpu/arm926ejs/omap/cpuinfo.c
index 0052daba8ee8070183a306b69efea72d1a444903..587d99a2bb02c5a368b7781d729f37f7eb5a2244 100644 (file)
--- a/arch/arm/cpu/arm926ejs/omap/cpuinfo.c
+++ b/arch/arm/cpu/arm926ejs/omap/cpuinfo.c
@@ -11,8 +11,9 @@
 
 #include <common.h>
 #include <command.h>
+#include <linux/compiler.h>
 
-#if defined(CONFIG_DISPLAY_CPUINFO) && defined(CONFIG_OMAP)
+#if defined(CONFIG_OMAP)
 
 #define omap_readw(x)          *(volatile unsigned short *)(x)
 #define omap_readl(x)          *(volatile unsigned long *)(x)
@@ -151,8 +152,8 @@ int print_cpuinfo (void)
        u8 die_rev;
        u32 omap_id;
        u8 cpu_type;
-       u32 system_serial_high;
-       u32 system_serial_low;
+       __maybe_unused u32 system_serial_high;
+       __maybe_unused u32 system_serial_low;
        u32 system_rev = 0;
 
        jtag_id = omap_get_jtag_id();
@@ -238,4 +239,4 @@ int print_cpuinfo (void)
        return 0;
 }
 
-#endif /* #if defined(CONFIG_DISPLAY_CPUINFO) && defined(CONFIG_OMAP) */
+#endif /* #if defined(CONFIG_OMAP) */