diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /arch/arm/mach-pxa/e750.c | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'arch/arm/mach-pxa/e750.c')
| -rw-r--r-- | arch/arm/mach-pxa/e750.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/e750.c b/arch/arm/mach-pxa/e750.c index 16ae72150b1b..6126c04e02bc 100644 --- a/arch/arm/mach-pxa/e750.c +++ b/arch/arm/mach-pxa/e750.c | |||
| @@ -131,6 +131,11 @@ static unsigned long e750_pin_config[] __initdata = { | |||
| 131 | /* IrDA */ | 131 | /* IrDA */ |
| 132 | GPIO38_GPIO | MFP_LPM_DRIVE_HIGH, | 132 | GPIO38_GPIO | MFP_LPM_DRIVE_HIGH, |
| 133 | 133 | ||
| 134 | /* Audio power control */ | ||
| 135 | GPIO4_GPIO, /* Headphone amp power */ | ||
| 136 | GPIO7_GPIO, /* Speaker amp power */ | ||
| 137 | GPIO37_GPIO, /* Headphone detect */ | ||
| 138 | |||
| 134 | /* PC Card */ | 139 | /* PC Card */ |
| 135 | GPIO8_GPIO, /* CD0 */ | 140 | GPIO8_GPIO, /* CD0 */ |
| 136 | GPIO44_GPIO, /* CD1 */ | 141 | GPIO44_GPIO, /* CD1 */ |