diff --git a/[refs] b/[refs] index 3e594a1819e9..41d570a60430 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbd40b38f739a2db956bf2bdd663fed3ec86277e +refs/heads/master: 9ffb571cb1b9dd103bf8d47f8527cd37163d7e12 diff --git a/trunk/arch/arm/mach-s3c64xx/clock.c b/trunk/arch/arm/mach-s3c64xx/clock.c index 0fd7417ae3f0..6562a06b72c5 100644 --- a/trunk/arch/arm/mach-s3c64xx/clock.c +++ b/trunk/arch/arm/mach-s3c64xx/clock.c @@ -314,10 +314,6 @@ static struct clk init_clocks_off[] = { .name = "sclk_mfc", .enable = s3c64xx_sclk_ctrl, .ctrlbit = S3C_CLKCON_SCLK_MFC, - }, { - .name = "cam", - .enable = s3c64xx_sclk_ctrl, - .ctrlbit = S3C_CLKCON_SCLK_CAM, }, { .name = "sclk_jpeg", .enable = s3c64xx_sclk_ctrl,