diff options
| author | root <root@dyn-67.arm.linux.org.uk> | 2009-03-24 18:04:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-24 18:04:25 -0400 |
| commit | 9a38e989b8ce04923f919fc2a8a24eb07fb484e2 (patch) | |
| tree | 6b99638dc32b99420ada46ca8d1373ad7aa5a208 /arch/arm/mach-pxa/tosa.c | |
| parent | 7d83f8fca517b123cf0136503a9e50974f65ec49 (diff) | |
| parent | 5fa82eb8ff06cd3ac4d64c6875922ae1dfa003c5 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 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 4f6f5024884e..6e8ade6ae339 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 | } |