From 376bd71658022d9e456b8a21008a9c50f272f990 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 15 Nov 2012 11:47:19 +0100 Subject: [PATCH] --- yaml --- r: 342506 b: refs/heads/master c: c9b1c7b34a17742054e2b967f7c126964343e4f2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ux500/board-mop500-pins.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 400072398769..1cdc1e4a47e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cf4726c253cc153faab239697b0c562c6975613 +refs/heads/master: c9b1c7b34a17742054e2b967f7c126964343e4f2 diff --git a/trunk/arch/arm/mach-ux500/board-mop500-pins.c b/trunk/arch/arm/mach-ux500/board-mop500-pins.c index 5770ed06cddb..6679d8a7c682 100644 --- a/trunk/arch/arm/mach-ux500/board-mop500-pins.c +++ b/trunk/arch/arm/mach-ux500/board-mop500-pins.c @@ -71,8 +71,6 @@ BIAS(in_wkup_pdis_en, PIN_SLPM_DIR_INPUT|PIN_SLPM_WAKEUP_ENABLE| PIN_SLPM_PDIS_ENABLED); BIAS(in_wkup_pdis, PIN_SLPM_DIR_INPUT|PIN_SLPM_WAKEUP_ENABLE| PIN_SLPM_PDIS_DISABLED); -BIAS(out_hi_wkup_pdis, PIN_SLPM_OUTPUT_HIGH|PIN_SLPM_WAKEUP_ENABLE| - PIN_SLPM_PDIS_DISABLED); BIAS(out_wkup_pdis, PIN_SLPM_DIR_OUTPUT|PIN_SLPM_WAKEUP_ENABLE| PIN_SLPM_PDIS_DISABLED);