diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-23 21:23:45 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-23 21:23:45 +0100 |
| commit | fdbe8b9a2d1858ba35dd6214315563ad44d4a0e3 (patch) | |
| tree | 98c39a0594ef02e08d5842cfff1f1d6bcc5a8eda /arch/arm/cpu | |
| parent | bd0f5ca806c73f9e1ef4a2a0416233ab7e257df9 (diff) | |
| parent | d780e74fc3abe6a8b9a01357720c15d974d83dae (diff) | |
| download | u-boot-imx-fdbe8b9a2d1858ba35dd6214315563ad44d4a0e3.zip u-boot-imx-fdbe8b9a2d1858ba35dd6214315563ad44d4a0e3.tar.gz u-boot-imx-fdbe8b9a2d1858ba35dd6214315563ad44d4a0e3.tar.bz2 | |
Merge branch 'hs@denx.de' of git://git.denx.de/u-boot-staging
* 'hs@denx.de' of git://git.denx.de/u-boot-staging:
drivers/net/dnet.c: Fix GCC 4.6 warnings
board/xaeniax/flash.c: Fix GCC 4.6 warnings
net/bootp.c: Fix GCC 4.6 warning
common/cmd_bootm.c: Fix GCC 4.6 warnings
board/mx1ads/mx1ads.c: Fix GCC 4.6 warning
board/mx1ads/syncflash.c: Fix GCC 4.6 warnings
board/lubbock/flash.c: Fix GCC 4.6 warnings
drivers/net/cs8900.c: Fix GCC 4.6 warning
arch/arm/cpu/arm926ejs/omap/cpuinfo.c: Fix GCC 4.6 warnings
drivers/net/lan91c96.c: Fix GCC 4.6 warning
board/ronetix/pm9263/pm9263.c: Fix GCC 4.6 warning
drivers/mtd/onenand/samsung.c: Fix GCC 4.6 warning
drivers/usb/musb/musb_hcd.c: Fix GCC 4.6 warning
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/omap/cpuinfo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/cpu/arm926ejs/omap/cpuinfo.c b/arch/arm/cpu/arm926ejs/omap/cpuinfo.c index 0052dab..02332ee 100644 --- a/arch/arm/cpu/arm926ejs/omap/cpuinfo.c +++ b/arch/arm/cpu/arm926ejs/omap/cpuinfo.c @@ -11,6 +11,7 @@ #include <common.h> #include <command.h> +#include <linux/compiler.h> #if defined(CONFIG_DISPLAY_CPUINFO) && defined(CONFIG_OMAP) @@ -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(); |