summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-06-05 22:14:40 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-06-05 22:14:40 +0200
commitc0f85a82484c25d23b44a87a35daddb2b276b4aa (patch)
tree38ba17a668c6ebfb1e74f4ee7ac80353cb729a9e
parent[ARM] Fix 4417/1: Serial: Fix AMBA drivers locking (diff)
downloadlinux-c0f85a82484c25d23b44a87a35daddb2b276b4aa.tar.xz
linux-c0f85a82484c25d23b44a87a35daddb2b276b4aa.zip
[ARM] pxa: fix pxa27x keyboard driver
CKEN macro definitions no longer contains the bit number; remove it from usages in the pxa27x keyboard driver. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/input/keyboard/pxa27x_keyboard.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/keyboard/pxa27x_keyboard.c b/drivers/input/keyboard/pxa27x_keyboard.c
index 06eaf766d9d2..f9e82c9ca421 100644
--- a/drivers/input/keyboard/pxa27x_keyboard.c
+++ b/drivers/input/keyboard/pxa27x_keyboard.c
@@ -104,7 +104,7 @@ static int pxakbd_open(struct input_dev *dev)
KPREC = 0x7F;
/* Enable unit clock */
- pxa_set_cken(CKEN19_KEYPAD, 1);
+ pxa_set_cken(CKEN_KEYPAD, 1);
return 0;
}
@@ -112,7 +112,7 @@ static int pxakbd_open(struct input_dev *dev)
static void pxakbd_close(struct input_dev *dev)
{
/* Disable clock unit */
- pxa_set_cken(CKEN19_KEYPAD, 0);
+ pxa_set_cken(CKEN_KEYPAD, 0);
}
#ifdef CONFIG_PM
@@ -185,7 +185,7 @@ static int __devinit pxakbd_probe(struct platform_device *pdev)
DRIVER_NAME, pdev);
if (error) {
printk(KERN_ERR "Cannot request keypad IRQ\n");
- pxa_set_cken(CKEN19_KEYPAD, 0);
+ pxa_set_cken(CKEN_KEYPAD, 0);
goto err_free_dev;
}