diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-21 03:48:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-21 03:48:33 -0400 |
| commit | f70cac8d9c7125f83048f8b3d1c60f5a041a165c (patch) | |
| tree | 0d0efd72c1a41f973a919b16aac1d8210ed1ee30 /arch/arm/mach-prima2/clock.c | |
| parent | 4722cd7741c6404f967f7a7b8b666540b6c1663e (diff) | |
| parent | 08aab447c56a5388cf0c768da476ad022f00fef8 (diff) | |
Merge branch 'kprobes-test' of git://git.yxit.co.uk/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-prima2/clock.c')
| -rw-r--r-- | arch/arm/mach-prima2/clock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-prima2/clock.c b/arch/arm/mach-prima2/clock.c index f9a2aaf63f71..615a4e75ceab 100644 --- a/arch/arm/mach-prima2/clock.c +++ b/arch/arm/mach-prima2/clock.c | |||
| @@ -481,6 +481,7 @@ static void __init sirfsoc_clk_init(void) | |||
| 481 | 481 | ||
| 482 | static struct of_device_id clkc_ids[] = { | 482 | static struct of_device_id clkc_ids[] = { |
| 483 | { .compatible = "sirf,prima2-clkc" }, | 483 | { .compatible = "sirf,prima2-clkc" }, |
| 484 | {}, | ||
| 484 | }; | 485 | }; |
| 485 | 486 | ||
| 486 | void __init sirfsoc_of_clk_init(void) | 487 | void __init sirfsoc_of_clk_init(void) |