diff options
| author | Eric Miao | 2009-03-23 02:55:09 +0100 |
|---|---|---|
| committer | Eric Miao | 2009-03-23 02:55:14 +0100 |
| commit | fa12868e59f5f49bc42b8befd94c531bb07ec120 (patch) | |
| tree | 25984e5d3941f37a72a5cd4ef8a6bafcaccc86a3 /arch/arm/mach-pxa/e740.c | |
| parent | [ARM] pxa/MioA701: Migrate after pxa27x_udc gpio_pullup functionality. (diff) | |
| parent | [ARM] pxa: add pxa320 missing pin function for CS2 on GPIO3 (diff) | |
| download | kernel-qcow2-linux-fa12868e59f5f49bc42b8befd94c531bb07ec120.tar.gz kernel-qcow2-linux-fa12868e59f5f49bc42b8befd94c531bb07ec120.tar.xz kernel-qcow2-linux-fa12868e59f5f49bc42b8befd94c531bb07ec120.zip | |
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/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) { pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config)); eseries_register_clks(); - clk_add_alias("CLK_CK48M", &e740_t7l66xb_device.dev, + clk_add_alias("CLK_CK48M", e740_t7l66xb_device.name, "UDCCLK", &pxa25x_device_udc.dev), eseries_get_tmio_gpios(); platform_add_devices(devices, ARRAY_SIZE(devices)); |