diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-18 01:37:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-18 01:37:49 -0400 |
| commit | dc3f81b129b5439ba7bac265bbc6a51a39275dae (patch) | |
| tree | 216030731d911249496d2e97206cd61431e31c89 /arch/arm/mach-pxa/zylonite_pxa320.c | |
| parent | d2517a49d55536b38c7a87e5289550cfedaa4dcc (diff) | |
| parent | 1406de8e11eb043681297adf86d6892ff8efc27a (diff) | |
Merge commit 'v2.6.30-rc6' into perfcounters/core
Merge reason: this branch was on an -rc4 base, merge it up to -rc6
to get the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-pxa/zylonite_pxa320.c')
| -rw-r--r-- | arch/arm/mach-pxa/zylonite_pxa320.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c index 4e1c488c6906..cc5a22833605 100644 --- 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 = { | |||
| 68 | GPIO38_AC97_SYNC, | 68 | GPIO38_AC97_SYNC, |
| 69 | GPIO39_AC97_BITCLK, | 69 | GPIO39_AC97_BITCLK, |
| 70 | GPIO40_AC97_nACRESET, | 70 | GPIO40_AC97_nACRESET, |
| 71 | GPIO36_GPIO, /* SDATA_IN_1 but unused - configure to GPIO */ | ||
| 71 | 72 | ||
| 72 | /* SSP3 */ | 73 | /* SSP3 */ |
| 73 | GPIO89_SSP3_SCLK, | 74 | GPIO89_SSP3_SCLK, |