Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux

4 files changed, 9 insertions, 10 deletions

diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c
index 2f60bf6b8d43..f854e7385e3c 100644
--- a/arch/arm/mach-s3c2443/clock.c
+++ b/arch/arm/mach-s3c2443/clock.c
@@ -1033,8 +1033,7 @@ void __init s3c2443_init_clocks(int xtal)
 
         fclk = pll / s3c2443_fclk_div(clkdiv0);
         hclk = s3c2443_prediv_getrate(&clk_prediv);
-        hclk = hclk / s3c2443_get_hdiv(clkdiv0);
-        hclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_HCLK) ? 2 : 1);
+        hclk /= s3c2443_get_hdiv(clkdiv0);
         pclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_PCLK) ? 2 : 1);
 
         s3c24xx_setup_clocks(xtal, fclk, hclk, pclk);
diff --git a/arch/arm/plat-s3c24xx/pwm-clock.c b/arch/arm/plat-s3c24xx/pwm-clock.c
index b8e854f1b1d5..3fad68a1e6bc 100644
--- a/arch/arm/plat-s3c24xx/pwm-clock.c
+++ b/arch/arm/plat-s3c24xx/pwm-clock.c
@@ -315,7 +315,7 @@ static int clk_pwm_tin_set_parent(struct clk *clk, struct clk *parent)
         if (parent == s3c24xx_pwmclk_tclk(id))
                 bits = S3C2410_TCFG1_MUX_TCLK << shift;
         else if (parent == s3c24xx_pwmclk_tdiv(id))
-                bits = clk_pwm_tdiv_bits(to_tdiv(clk)) << shift;
+                bits = clk_pwm_tdiv_bits(to_tdiv(parent)) << shift;
         else
                 return -EINVAL;
 
diff --git a/arch/arm/plat-s3c24xx/pwm.c b/arch/arm/plat-s3c24xx/pwm.c
index feb770f2e84e..ec56b88866c4 100644
--- a/arch/arm/plat-s3c24xx/pwm.c
+++ b/arch/arm/plat-s3c24xx/pwm.c
@@ -56,7 +56,7 @@ static struct clk *clk_scaler[2];
                 }                                       \
         }
 
-#define DEFINE_TIMER(_tmr_no, _irq)                     \
+#define DEFINE_S3C_TIMER(_tmr_no, _irq)                 \
         .name           = "s3c24xx-pwm",                \
         .id             = _tmr_no,                      \
         .num_resources  = TIMER_RESOURCE_SIZE,          \
@@ -67,11 +67,11 @@ static struct clk *clk_scaler[2];
  */
 
 struct platform_device s3c_device_timer[] = {
-        [0] = { DEFINE_TIMER(0, IRQ_TIMER0) },
-        [1] = { DEFINE_TIMER(1, IRQ_TIMER1) },
-        [2] = { DEFINE_TIMER(2, IRQ_TIMER2) },
-        [3] = { DEFINE_TIMER(3, IRQ_TIMER3) },
-        [4] = { DEFINE_TIMER(4, IRQ_TIMER4) },
+        [0] = { DEFINE_S3C_TIMER(0, IRQ_TIMER0) },
+        [1] = { DEFINE_S3C_TIMER(1, IRQ_TIMER1) },
+        [2] = { DEFINE_S3C_TIMER(2, IRQ_TIMER2) },
+        [3] = { DEFINE_S3C_TIMER(3, IRQ_TIMER3) },
+        [4] = { DEFINE_S3C_TIMER(4, IRQ_TIMER4) },
 };
 
 static inline int pwm_is_tdiv(struct pwm_device *pwm)
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index db783b77a881..c94d3c4b7521 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -457,7 +457,7 @@ config SERIAL_SAMSUNG
 
 config SERIAL_SAMSUNG_DEBUG
         bool "Samsung SoC serial debug"
-        depends on SERIAL_SAMSUNG
+        depends on SERIAL_SAMSUNG && DEBUG_LL
         help
           Add support for debugging the serial driver. Since this is
           generally being used as a console, we use our own output