diff --git a/[refs] b/[refs] index 160e7f69af8d..311714446bd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53442e1cbdc1559cd39e0076adae6df64af36a3e +refs/heads/master: d1a3336e2fdd5dc48b80acee6f0aaa65ebb3426c diff --git a/trunk/arch/blackfin/Kconfig b/trunk/arch/blackfin/Kconfig index 3a468436258d..1f31ea74ce9b 100644 --- a/trunk/arch/blackfin/Kconfig +++ b/trunk/arch/blackfin/Kconfig @@ -1062,7 +1062,7 @@ config PM_WAKEUP_GPIO_NUMBER int "GPIO number" range 0 47 depends on PM_WAKEUP_BY_GPIO - default 2 if BFIN537_STAMP + default 2 choice prompt "GPIO Polarity"