diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-12 06:17:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-12 06:17:36 -0400 |
| commit | 6cda3eb62ef42aa5acd649bf99c8db544e0f4051 (patch) | |
| tree | 93f74ca002f5756c8e157611174f9540b5cf41c0 /arch/arm/mach-pxa/zylonite_pxa320.c | |
| parent | b9c61b70075c87a8612624736faf4a2de5b1ed30 (diff) | |
| parent | cec6be6d1069d697beb490bbb40a290d5ff554a2 (diff) | |
Merge branch 'x86/apic' into irq/numa
Merge reason: both topics modify the APIC code but were able to do it in
parallel so far. An upcoming patch generates a conflict so
merge them to avoid the conflict.
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, |