diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-23 16:42:30 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-23 16:42:30 +0000 |
| commit | dc85ce155b7cad4c39c1fc95b4f6281920cef3c8 (patch) | |
| tree | 5b7b353f9dbd6590493eb33f405e4ac8524b90e0 /arch/arm/mach-pxa/tosa.c | |
| parent | 4731f8b66dd34ebf0e67ca6ba9162b0e509bec06 (diff) | |
| parent | 1efb71809fd47bc19b3ce05080e1d5085a8dfab1 (diff) | |
| download | kernel_samsung_smdk4412-dc85ce155b7cad4c39c1fc95b4f6281920cef3c8.tar.gz kernel_samsung_smdk4412-dc85ce155b7cad4c39c1fc95b4f6281920cef3c8.tar.bz2 kernel_samsung_smdk4412-dc85ce155b7cad4c39c1fc95b4f6281920cef3c8.zip | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/tosa.c')
| -rw-r--r-- | arch/arm/mach-pxa/tosa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 3332e5d0356..3fe137fc72d 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c @@ -919,7 +919,7 @@ static void __init tosa_init(void) pxa2xx_set_spi_info(2, &pxa_ssp_master_info); spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); - clk_add_alias("CLK_CK3P6MI", &tc6393xb_device.dev, "GPIO11_CLK", NULL); + clk_add_alias("CLK_CK3P6MI", tc6393xb_device.name, "GPIO11_CLK", NULL); platform_add_devices(devices, ARRAY_SIZE(devices)); } |