diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:42 -0400 |
| commit | ae82bfd61ca7e57cc2d914add9ab0873e260f2f5 (patch) | |
| tree | a7f862ad8b0ae4f2e8953e6aa613eb702b484ecf /arch/arm/plat-omap/clock.c | |
| parent | cd74c86bdf705f824d494a2bbda393d1d562b40a (diff) | |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff) | |
Merge branch 'linus' into perfcounters/rename
Merge reason: pull in all the latest code before doing the rename.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/plat-omap/clock.c')
| -rw-r--r-- | arch/arm/plat-omap/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index e8c327a45a55..bf880e966d3b 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c | |||
| @@ -488,7 +488,7 @@ static int __init clk_debugfs_init(void) | |||
| 488 | } | 488 | } |
| 489 | return 0; | 489 | return 0; |
| 490 | err_out: | 490 | err_out: |
| 491 | debugfs_remove(clk_debugfs_root); /* REVISIT: Cleanup correctly */ | 491 | debugfs_remove_recursive(clk_debugfs_root); |
| 492 | return err; | 492 | return err; |
| 493 | } | 493 | } |
| 494 | late_initcall(clk_debugfs_init); | 494 | late_initcall(clk_debugfs_init); |