diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-06-05 16:14:40 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-06-05 16:14:40 -0400 |
commit | c0f85a82484c25d23b44a87a35daddb2b276b4aa (patch) | |
tree | 38ba17a668c6ebfb1e74f4ee7ac80353cb729a9e /drivers/input | |
parent | db002b8597df84643e949cce793d0f696f100c9e (diff) |
[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>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/keyboard/pxa27x_keyboard.c | 6 |
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) | |||
104 | KPREC = 0x7F; | 104 | KPREC = 0x7F; |
105 | 105 | ||
106 | /* Enable unit clock */ | 106 | /* Enable unit clock */ |
107 | pxa_set_cken(CKEN19_KEYPAD, 1); | 107 | pxa_set_cken(CKEN_KEYPAD, 1); |
108 | 108 | ||
109 | return 0; | 109 | return 0; |
110 | } | 110 | } |
@@ -112,7 +112,7 @@ static int pxakbd_open(struct input_dev *dev) | |||
112 | static void pxakbd_close(struct input_dev *dev) | 112 | static void pxakbd_close(struct input_dev *dev) |
113 | { | 113 | { |
114 | /* Disable clock unit */ | 114 | /* Disable clock unit */ |
115 | pxa_set_cken(CKEN19_KEYPAD, 0); | 115 | pxa_set_cken(CKEN_KEYPAD, 0); |
116 | } | 116 | } |
117 | 117 | ||
118 | #ifdef CONFIG_PM | 118 | #ifdef CONFIG_PM |
@@ -185,7 +185,7 @@ static int __devinit pxakbd_probe(struct platform_device *pdev) | |||
185 | DRIVER_NAME, pdev); | 185 | DRIVER_NAME, pdev); |
186 | if (error) { | 186 | if (error) { |
187 | printk(KERN_ERR "Cannot request keypad IRQ\n"); | 187 | printk(KERN_ERR "Cannot request keypad IRQ\n"); |
188 | pxa_set_cken(CKEN19_KEYPAD, 0); | 188 | pxa_set_cken(CKEN_KEYPAD, 0); |
189 | goto err_free_dev; | 189 | goto err_free_dev; |
190 | } | 190 | } |
191 | 191 | ||