diff options
| author | Eric Miao <eric.miao@marvell.com> | 2009-03-23 02:55:09 +0100 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2009-03-23 02:55:14 +0100 |
| commit | fa12868e59f5f49bc42b8befd94c531bb07ec120 (patch) | |
| tree | 25984e5d3941f37a72a5cd4ef8a6bafcaccc86a3 /arch/arm/mach-pxa/e800.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 | linux-fa12868e59f5f49bc42b8befd94c531bb07ec120.tar.xz 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/e800.c')
| -rw-r--r-- | arch/arm/mach-pxa/e800.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/e800.c b/arch/arm/mach-pxa/e800.c index f8924f6ca544..74ab09812a72 100644 --- a/arch/arm/mach-pxa/e800.c +++ b/arch/arm/mach-pxa/e800.c @@ -194,7 +194,7 @@ static struct platform_device *devices[] __initdata = { static void __init e800_init(void) { - clk_add_alias("CLK_CK3P6MI", &e800_tc6393xb_device.dev, + clk_add_alias("CLK_CK3P6MI", e800_tc6393xb_device.name, "GPIO11_CLK", NULL), eseries_get_tmio_gpios(); platform_add_devices(devices, ARRAY_SIZE(devices)); |