summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-02-03 09:55:55 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2014-02-03 09:55:55 +0100
commitadbf51abdec9a50ee88a117353441211f1b9d6aa (patch)
treebda741154a075b519ddbbae856d1a048e3f3029d /arch/arm/mach-imx
parentada75addeea07e91b6e689894a0ef826b0c176dc (diff)
parent706cef7e5bd9faafeb1ec599bf5270ea07063d56 (diff)
downloadbarebox-adbf51abdec9a50ee88a117353441211f1b9d6aa.tar.gz
barebox-adbf51abdec9a50ee88a117353441211f1b9d6aa.tar.xz
Merge branch 'for-next/pxa'
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/imx1.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/imx1.c b/arch/arm/mach-imx/imx1.c
index 78a0242474..51bdcbf38e 100644
--- a/arch/arm/mach-imx/imx1.c
+++ b/arch/arm/mach-imx/imx1.c
@@ -30,13 +30,13 @@ static void imx1_detect_reset_source(void)
switch (val) {
case RSR_EXR:
- set_reset_source(RESET_RST);
+ reset_source_set(RESET_RST);
return;
case RSR_WDR:
- set_reset_source(RESET_WDG);
+ reset_source_set(RESET_WDG);
return;
case 0:
- set_reset_source(RESET_POR);
+ reset_source_set(RESET_POR);
return;
default:
/* else keep the default 'unknown' state */