diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-29 05:04:24 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-29 05:04:24 -0400 |
| commit | 42f1d2e06a25628ae4ceaadccc4fa67c7787e2b4 (patch) | |
| tree | 8aac83e399de7ad13748a59853a0feea9ed2c5cb /arch/arm/plat-s3c/clock.c | |
| parent | 9af5324a070e0b2dcb6e22c89e17424eba245fcc (diff) | |
| parent | 77bbca138c64cb80259732db6f70e1668123f2a7 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel
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 | ||