diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-27 07:39:14 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-27 07:39:14 -0500 |
| commit | e902be56cbf2a48d96d11d6884767e638d41c712 (patch) | |
| tree | e4d79479a1280ad4841005680e37119d6694c3bf /drivers/input | |
| parent | c750815e2d436f4379c7af8a8770ef2ae71c5607 (diff) | |
| parent | 5e1dbdb458ada37f7e97265cb2ea87c55fd5d034 (diff) | |
Merge branches 'core' and 'clks' into devel
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/keyboard/pxa27x_keypad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c index 6d30c6d334c3..0d2fc64a5e1c 100644 --- a/drivers/input/keyboard/pxa27x_keypad.c +++ b/drivers/input/keyboard/pxa27x_keypad.c | |||
| @@ -475,7 +475,7 @@ static int __devinit pxa27x_keypad_probe(struct platform_device *pdev) | |||
| 475 | goto failed_free_mem; | 475 | goto failed_free_mem; |
| 476 | } | 476 | } |
| 477 | 477 | ||
| 478 | keypad->clk = clk_get(&pdev->dev, "KBDCLK"); | 478 | keypad->clk = clk_get(&pdev->dev, NULL); |
| 479 | if (IS_ERR(keypad->clk)) { | 479 | if (IS_ERR(keypad->clk)) { |
| 480 | dev_err(&pdev->dev, "failed to get keypad clock\n"); | 480 | dev_err(&pdev->dev, "failed to get keypad clock\n"); |
| 481 | error = PTR_ERR(keypad->clk); | 481 | error = PTR_ERR(keypad->clk); |