Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[pandora-kernel.git] / arch / arm / mach-pxa / zylonite_pxa320.c

diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c
index 4e1c488..cc5a228 100644 (file)
--- a/arch/arm/mach-pxa/zylonite_pxa320.c
+++ b/arch/arm/mach-pxa/zylonite_pxa320.c
@@ -68,6 +68,7 @@ static mfp_cfg_t mfp_cfg[] __initdata = {
        GPIO38_AC97_SYNC,
        GPIO39_AC97_BITCLK,
        GPIO40_AC97_nACRESET,
+       GPIO36_GPIO,    /* SDATA_IN_1 but unused - configure to GPIO */
 
        /* SSP3 */
        GPIO89_SSP3_SCLK,