diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-29 05:46:10 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-29 05:46:10 -0400 |
| commit | e93721a70263afefbac781f575bfe851c6f95d84 (patch) | |
| tree | ab359f12a0688802aa99339bae82c51763dae9f6 /arch/arm/plat-s3c/clock.c | |
| parent | ae1ec5e1e97f67d41e641a73380129e5905e41cc (diff) | |
| parent | c87d9732004b3f8fd82d729f12ccfb96c0df279e (diff) | |
Merge branch 'fix/pcm-jiffies-check' into topic/pcm-jiffies-check
Diffstat (limited to 'arch/arm/plat-s3c/clock.c')
| -rw-r--r-- | arch/arm/plat-s3c/clock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c/clock.c b/arch/arm/plat-s3c/clock.c index b6be76e2fe51..4d01ef1a25dd 100644 --- a/arch/arm/plat-s3c/clock.c +++ b/arch/arm/plat-s3c/clock.c | |||
| @@ -306,8 +306,6 @@ struct clk s3c24xx_uclk = { | |||
| 306 | 306 | ||
| 307 | int s3c24xx_register_clock(struct clk *clk) | 307 | int s3c24xx_register_clock(struct clk *clk) |
| 308 | { | 308 | { |
| 309 | clk->owner = THIS_MODULE; | ||
| 310 | |||
| 311 | if (clk->enable == NULL) | 309 | if (clk->enable == NULL) |
| 312 | clk->enable = clk_null_enable; | 310 | clk->enable = clk_null_enable; |
| 313 | 311 | ||