diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-01 17:25:59 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-01 17:25:59 +0100 |
| commit | 6cbf70a01a0d40280acc2eb32508327d00317476 (patch) | |
| tree | 316581a993ea6e9b7b581290c5feb61c9cbf3eb2 /arch/arm/mach-imx | |
| parent | e4ee34a829a00e058828f3daade04f4141ea3ef9 (diff) | |
| parent | 7d3da14a7e187d05ee42fb7e628fb4091207b5e3 (diff) | |
| download | barebox-6cbf70a01a0d40280acc2eb32508327d00317476.tar.gz barebox-6cbf70a01a0d40280acc2eb32508327d00317476.tar.xz | |
Merge branch 'pu'
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/clko.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/speed.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index a1b2c1c459..eeb392aa1e 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -57,10 +57,12 @@ config ARCH_IMX27 select ARCH_HAS_FEC_IMX config ARCH_IMX31 + select CPU_V6 bool "i.MX31" config ARCH_IMX35 bool "i.MX35" + select CPU_V6 select ARCH_HAS_FEC_IMX endchoice diff --git a/arch/arm/mach-imx/clko.c b/arch/arm/mach-imx/clko.c index b6efe8780a..37e17fe917 100644 --- a/arch/arm/mach-imx/clko.c +++ b/arch/arm/mach-imx/clko.c @@ -4,7 +4,7 @@ #include <mach/imx-regs.h> #include <mach/clock.h> -static int do_clko (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_clko(struct command *cmdtp, int argc, char *argv[]) { int opt, div = 0, src = -2, ret; diff --git a/arch/arm/mach-imx/speed.c b/arch/arm/mach-imx/speed.c index 76ab6b9bed..e024733246 100644 --- a/arch/arm/mach-imx/speed.c +++ b/arch/arm/mach-imx/speed.c @@ -69,7 +69,7 @@ unsigned int imx_decode_pll(unsigned int reg_val, unsigned int freq) extern void imx_dump_clocks(void); -static int do_clocks (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_clocks(struct command *cmdtp, int argc, char *argv[]) { imx_dump_clocks(); |