From c5169cec50c75dc4cde4d245a5bf2c4d43d20681 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Fri, 6 Jul 2012 11:26:37 -0700
Subject: [PATCH] --- yaml --- r: 318285 b: refs/heads/master c:
 a40ec72d540553fc0e1d1fea94c1d7629b7f35f4 h: refs/heads/master i:   318283:
 581eab7f0974154d16691e2268cb5d3d76ad6e76 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/input/keyboard/imx_keypad.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 94fc8f7b1df0..17371630ca8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1e636e6d35944a2b970481b78a621774276acfd
+refs/heads/master: a40ec72d540553fc0e1d1fea94c1d7629b7f35f4
diff --git a/trunk/drivers/input/keyboard/imx_keypad.c b/trunk/drivers/input/keyboard/imx_keypad.c
index 9d57945db53d..4830615ed2ec 100644
--- a/trunk/drivers/input/keyboard/imx_keypad.c
+++ b/trunk/drivers/input/keyboard/imx_keypad.c
@@ -467,7 +467,7 @@ static int __devinit imx_keypad_probe(struct platform_device *pdev)
 		goto failed_free_priv;
 	}
 
-	keypad->clk = clk_get(&pdev->dev, "kpp");
+	keypad->clk = clk_get(&pdev->dev, NULL);
 	if (IS_ERR(keypad->clk)) {
 		dev_err(&pdev->dev, "failed to get keypad clock\n");
 		error = PTR_ERR(keypad->clk);