From 7373f2662ddf3321a49852a19113b732cff25c4e Mon Sep 17 00:00:00 2001 From: Ranjith Lohithakshan Date: Mon, 3 May 2010 17:07:51 +0530 Subject: [PATCH] --- yaml --- r: 196159 b: refs/heads/master c: f3a8cde6bc58d97723cbc965d4d03a7cd86152fb h: refs/heads/master i: 196157: a1662231cfcd61d6c467cf4138c1a2b62c49a40d 196155: 73950f3a5ac31c38b59c859c60ef8ae8ed6c1784 196151: 3f048cd311d247e36b74a5483902f9afa3553321 196143: 87c9c4349754b07f5d0679463c56b6328e58a27f 196127: 3e9efc677ef8fa9d55d1b10c95a6a568b2feed09 196095: fb7d86b5042e4db8e2bebb991e10e0413092874d v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/board-omap3evm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e5da87b73fd5..20012acd9e82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e2efde9f1ba2fb918245f9419246e4e59b42a11 +refs/heads/master: f3a8cde6bc58d97723cbc965d4d03a7cd86152fb diff --git a/trunk/arch/arm/mach-omap2/board-omap3evm.c b/trunk/arch/arm/mach-omap2/board-omap3evm.c index 017bb2f4f7d2..3548fb859123 100644 --- a/trunk/arch/arm/mach-omap2/board-omap3evm.c +++ b/trunk/arch/arm/mach-omap2/board-omap3evm.c @@ -651,10 +651,10 @@ static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = { #ifdef CONFIG_OMAP_MUX static struct omap_board_mux board_mux[] __initdata = { OMAP3_MUX(SYS_NIRQ, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP | - OMAP_PIN_OFF_INPUT_PULLUP | + OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW | OMAP_PIN_OFF_WAKEUPENABLE), OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP | - OMAP_PIN_OFF_INPUT_PULLUP | + OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW | OMAP_PIN_OFF_WAKEUPENABLE), { .reg_offset = OMAP_MUX_TERMINATOR }, };