diff --git a/[refs] b/[refs]
index 06160879acf3..276f80152781 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c4fe3aa98aebdcc7406dbf6e54b7b1b125dbbf3
+refs/heads/master: ce6b658dc040cf4aa3a30f56115e81d15d91596e
diff --git a/trunk/drivers/gpio/gpio-davinci.c b/trunk/drivers/gpio/gpio-davinci.c
index 3d000169285d..17df6db5dca7 100644
--- a/trunk/drivers/gpio/gpio-davinci.c
+++ b/trunk/drivers/gpio/gpio-davinci.c
@@ -366,7 +366,7 @@ static int __init davinci_gpio_irq_setup(void)
 		       PTR_ERR(clk));
 		return PTR_ERR(clk);
 	}
-	clk_enable(clk);
+	clk_prepare_enable(clk);
 
 	/* Arrange gpio_to_irq() support, handling either direct IRQs or
 	 * banked IRQs.  Having GPIOs in the first GPIO bank use direct