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/tosa.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/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 66b13802c99d..581dc105690c 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) | |||
| 919 | pxa2xx_set_spi_info(2, &pxa_ssp_master_info); | 919 | pxa2xx_set_spi_info(2, &pxa_ssp_master_info); |
| 920 | spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); | 920 | spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); |
| 921 | 921 | ||
| 922 | clk_add_alias("CLK_CK3P6MI", &tc6393xb_device.dev, "GPIO11_CLK", NULL); | 922 | clk_add_alias("CLK_CK3P6MI", tc6393xb_device.name, "GPIO11_CLK", NULL); |
| 923 | 923 | ||
| 924 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 924 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
| 925 | } | 925 | } |