diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 12:34:16 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 12:34:16 -0500 |
| commit | 4567c4a89693416ccca02d32109bce967e9c1ade (patch) | |
| tree | 9d77cf02ce269ed5fc4b6e2ebddb9ad7fd504ad1 /arch/arm/mach-pxa/e740.c | |
| parent | 602fd7c36728a04e61a442c9755e7d454501266c (diff) | |
| parent | 19d6c13b56a78b3757e747f469285c2a546d634a (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-pxa/e740.c')
| -rw-r--r-- | arch/arm/mach-pxa/e740.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/e740.c b/arch/arm/mach-pxa/e740.c index 49acdfa6650d..94b23a9e3877 100644 --- a/arch/arm/mach-pxa/e740.c +++ b/arch/arm/mach-pxa/e740.c | |||
| @@ -192,6 +192,9 @@ static struct platform_device *devices[] __initdata = { | |||
| 192 | static void __init e740_init(void) | 192 | static void __init e740_init(void) |
| 193 | { | 193 | { |
| 194 | pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config)); | 194 | pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config)); |
| 195 | pxa_set_ffuart_info(NULL); | ||
| 196 | pxa_set_btuart_info(NULL); | ||
| 197 | pxa_set_stuart_info(NULL); | ||
| 195 | eseries_register_clks(); | 198 | eseries_register_clks(); |
| 196 | clk_add_alias("CLK_CK48M", e740_t7l66xb_device.name, | 199 | clk_add_alias("CLK_CK48M", e740_t7l66xb_device.name, |
| 197 | "UDCCLK", &pxa25x_device_udc.dev), | 200 | "UDCCLK", &pxa25x_device_udc.dev), |