From c9f27bee621595d4fa560160622d4710ed148924 Mon Sep 17 00:00:00 2001 From: Ivan Khoronzhuk Date: Fri, 28 Dec 2012 02:09:30 -0700 Subject: [PATCH] --- yaml --- r: 348491 b: refs/heads/master c: 62bafd1a8f99196c233b9469384eae6644b1d6c3 h: refs/heads/master i: 348489: 52f00cd29a9a4ccd52408db651b927146125f459 348487: 4d10abf14f1472edf6d85a341832d744bb15bebd v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/prm44xx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index efd64cb41486..35d762394b77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fbe7c24256d7dd8d9d280fc9270af78aea21627 +refs/heads/master: 62bafd1a8f99196c233b9469384eae6644b1d6c3 diff --git a/trunk/arch/arm/mach-omap2/prm44xx.c b/trunk/arch/arm/mach-omap2/prm44xx.c index 7498bc77fe8b..e335216ac0eb 100644 --- a/trunk/arch/arm/mach-omap2/prm44xx.c +++ b/trunk/arch/arm/mach-omap2/prm44xx.c @@ -56,9 +56,9 @@ static struct omap_prcm_irq_setup omap4_prcm_irq_setup = { * enumeration) */ static struct prm_reset_src_map omap44xx_prm_reset_src_map[] = { - { OMAP4430_RST_GLOBAL_WARM_SW_SHIFT, + { OMAP4430_GLOBAL_WARM_SW_RST_SHIFT, OMAP_GLOBAL_WARM_RST_SRC_ID_SHIFT }, - { OMAP4430_RST_GLOBAL_COLD_SW_SHIFT, + { OMAP4430_GLOBAL_COLD_RST_SHIFT, OMAP_GLOBAL_COLD_RST_SRC_ID_SHIFT }, { OMAP4430_MPU_SECURITY_VIOL_RST_SHIFT, OMAP_SECU_VIOL_RST_SRC_ID_SHIFT },