diff options
| author | Eric Miao <eric.miao@marvell.com> | 2009-03-22 21:55:09 -0400 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2009-03-22 21:55:14 -0400 |
| commit | fa12868e59f5f49bc42b8befd94c531bb07ec120 (patch) | |
| tree | 25984e5d3941f37a72a5cd4ef8a6bafcaccc86a3 /arch/arm/mach-pxa/e750.c | |
| parent | cefdb2a4436ec83b4c8b349aa30f976d30c22e25 (diff) | |
| parent | 1efb71809fd47bc19b3ce05080e1d5085a8dfab1 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git into devel
Diffstat (limited to 'arch/arm/mach-pxa/e750.c')
| -rw-r--r-- | arch/arm/mach-pxa/e750.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/e750.c b/arch/arm/mach-pxa/e750.c index 84b050f1a99..16ae72150b1 100644 --- a/arch/arm/mach-pxa/e750.c +++ b/arch/arm/mach-pxa/e750.c | |||
| @@ -188,7 +188,7 @@ static struct platform_device *devices[] __initdata = { | |||
| 188 | static void __init e750_init(void) | 188 | static void __init e750_init(void) |
| 189 | { | 189 | { |
| 190 | pxa2xx_mfp_config(ARRAY_AND_SIZE(e750_pin_config)); | 190 | pxa2xx_mfp_config(ARRAY_AND_SIZE(e750_pin_config)); |
| 191 | clk_add_alias("CLK_CK3P6MI", &e750_tc6393xb_device.dev, | 191 | clk_add_alias("CLK_CK3P6MI", e750_tc6393xb_device.name, |
| 192 | "GPIO11_CLK", NULL), | 192 | "GPIO11_CLK", NULL), |
| 193 | eseries_get_tmio_gpios(); | 193 | eseries_get_tmio_gpios(); |
| 194 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 194 | platform_add_devices(devices, ARRAY_SIZE(devices)); |