diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-04-02 12:07:48 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-04-02 12:07:48 +0200 |
| commit | c1894b4bc7ae58f74b01e4a31b267680c721b727 (patch) | |
| tree | ab56e162ebedc90ee6c88e286ab20ccb066551f3 /arch/arm/mach-imx | |
| parent | c6cdbe71c9614d2fc409d4d538e80a53a4bcdc32 (diff) | |
| parent | e3b204668525636ee1c0de4d4869822b050d7c69 (diff) | |
| download | barebox-c1894b4bc7ae58f74b01e4a31b267680c721b727.tar.gz barebox-c1894b4bc7ae58f74b01e4a31b267680c721b727.tar.xz | |
Merge branch 'pu' into next
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/clocksource.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index eeb392aa1e..10561f0866 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -228,7 +228,8 @@ config MACH_PCM043 bool "phyCORE-i.MX35" select HAS_CFI select HAVE_MMU - select MACH_HAS_LOWLEVEL_INIT + select MACH_HAS_LOWLEVEL_INIT + select ARCH_HAS_L2X0 help Say Y here if you are using Phytec's phyCORE-i.MX35 (pcm043) equipped with a Freescale i.MX35 Processor diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c index 09d43183b8..4b400a0ca7 100644 --- a/arch/arm/mach-imx/clocksource.c +++ b/arch/arm/mach-imx/clocksource.c @@ -95,7 +95,7 @@ core_initcall(clocksource_init); /* * Reset the cpu by setting up the watchdog timer and let it time out */ -void reset_cpu (ulong ignored) +void __noreturn reset_cpu (unsigned long ignored) { /* Disable watchdog and set Time-Out field to 0 */ WCR = 0x0000; |