diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-06-06 20:21:25 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-06-06 20:21:28 +0200 |
commit | 75b5032212641f6d38ac041416945e70da833b68 (patch) | |
tree | bb827401e00c1681a29e75ade3b4ecc903df1a54 /arch/arm/mach-pxa/palmtx.c | |
parent | 0b73da3f40128eab6ca2a07508f424029a1edaeb (diff) | |
parent | b87297fb405ef13cac375f202d114323b076a56d (diff) | |
download | linux-stable-75b5032212641f6d38ac041416945e70da833b68.tar.gz linux-stable-75b5032212641f6d38ac041416945e70da833b68.tar.bz2 linux-stable-75b5032212641f6d38ac041416945e70da833b68.zip |
Merge branch 'linus' into perfcounters/core
Merge reason: Pick up the latest fixes before the -v8 perfcounters
release.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-pxa/palmtx.c')
-rw-r--r-- | arch/arm/mach-pxa/palmtx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c index e2d44b1a8a9b..e99a893c58a7 100644 --- a/arch/arm/mach-pxa/palmtx.c +++ b/arch/arm/mach-pxa/palmtx.c @@ -65,6 +65,7 @@ static unsigned long palmtx_pin_config[] __initdata = { GPIO29_AC97_SDATA_IN_0, GPIO30_AC97_SDATA_OUT, GPIO31_AC97_SYNC, + GPIO89_AC97_SYSCLK, GPIO95_AC97_nRESET, /* IrDA */ |