summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/arch-mx31/imx-regs.h
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2011-04-29 08:56:27 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-05-11 23:03:15 +0200
commit2f22045be5590e3034b0d55cac9fd050f7837a17 (patch)
tree0d5c70f0edcbab4d508c6c7a275b3f7bf4ad5e2e /arch/arm/include/asm/arch-mx31/imx-regs.h
parentd109b11e54739212632e3f5309c62a7d5cd49773 (diff)
downloadtalos-obmc-uboot-2f22045be5590e3034b0d55cac9fd050f7837a17.tar.gz
talos-obmc-uboot-2f22045be5590e3034b0d55cac9fd050f7837a17.zip
MX31: change return value of get_cpu_rev
Drop warnings in get_cpu_rev and changes the return value (a u32 instead of char * is returned) of the function to be coherent with other processors. Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Detlev Zundel <dzu@denx.de> CC: Fabio Estevam <fabio.estevam@freescale.com>
Diffstat (limited to 'arch/arm/include/asm/arch-mx31/imx-regs.h')
-rw-r--r--arch/arm/include/asm/arch-mx31/imx-regs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-mx31/imx-regs.h b/arch/arm/include/asm/arch-mx31/imx-regs.h
index c830a0374e..306f966139 100644
--- a/arch/arm/include/asm/arch-mx31/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx31/imx-regs.h
@@ -105,7 +105,7 @@ struct iim_regs {
struct mx3_cpu_type {
u8 srev;
- char *v;
+ u32 v;
};
#define IOMUX_PADNUM_MASK 0x1ff
OpenPOWER on IntegriCloud