diff options
| author | root <root@dyn-67.arm.linux.org.uk> | 2009-03-24 18:04:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-24 18:04:25 -0400 |
| commit | 9a38e989b8ce04923f919fc2a8a24eb07fb484e2 (patch) | |
| tree | 6b99638dc32b99420ada46ca8d1373ad7aa5a208 /arch/arm/mach-pxa/e740.c | |
| parent | 7d83f8fca517b123cf0136503a9e50974f65ec49 (diff) | |
| parent | 5fa82eb8ff06cd3ac4d64c6875922ae1dfa003c5 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-pxa/e740.c')
| -rw-r--r-- | arch/arm/mach-pxa/e740.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/e740.c b/arch/arm/mach-pxa/e740.c index e0c3aaf1ecb3..54af7ed1397e 100644 --- a/arch/arm/mach-pxa/e740.c +++ b/arch/arm/mach-pxa/e740.c | |||
| @@ -187,7 +187,7 @@ static void __init e740_init(void) | |||
| 187 | { | 187 | { |
| 188 | pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config)); | 188 | pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config)); |
| 189 | eseries_register_clks(); | 189 | eseries_register_clks(); |
| 190 | clk_add_alias("CLK_CK48M", &e740_t7l66xb_device.dev, | 190 | clk_add_alias("CLK_CK48M", e740_t7l66xb_device.name, |
| 191 | "UDCCLK", &pxa25x_device_udc.dev), | 191 | "UDCCLK", &pxa25x_device_udc.dev), |
| 192 | eseries_get_tmio_gpios(); | 192 | eseries_get_tmio_gpios(); |
| 193 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 193 | platform_add_devices(devices, ARRAY_SIZE(devices)); |