git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
mach-omap1
/
board-nokia770.c
diff --git
a/arch/arm/mach-omap1/board-nokia770.c
b/arch/arm/mach-omap1/board-nokia770.c
index
02b980d
..
cbe909b
100644
(file)
--- a/
arch/arm/mach-omap1/board-nokia770.c
+++ b/
arch/arm/mach-omap1/board-nokia770.c
@@
-71,9
+71,11
@@
static struct resource nokia770_kp_resources[] = {
};
static struct omap_kp_platform_data nokia770_kp_data = {
};
static struct omap_kp_platform_data nokia770_kp_data = {
- .rows = 8,
- .cols = 8,
- .keymap = nokia770_keymap
+ .rows = 8,
+ .cols = 8,
+ .keymap = nokia770_keymap,
+ .keymapsize = ARRAY_SIZE(nokia770_keymap),
+ .delay = 4,
};
static struct platform_device nokia770_kp_device = {
};
static struct platform_device nokia770_kp_device = {
@@
-189,7
+191,7
@@
static void nokia770_audio_pwr_up(void)
printk("HP connected\n");
}
printk("HP connected\n");
}
-static void codec_delayed_power_down(
void *arg
)
+static void codec_delayed_power_down(
struct work_struct *work
)
{
down(&audio_pwr_sem);
if (audio_pwr_state == -1)
{
down(&audio_pwr_sem);
if (audio_pwr_state == -1)
@@
-198,7
+200,7
@@
static void codec_delayed_power_down(void *arg)
up(&audio_pwr_sem);
}
up(&audio_pwr_sem);
}
-static DECLARE_
WORK(codec_power_down_work, codec_delayed_power_down, NULL
);
+static DECLARE_
DELAYED_WORK(codec_power_down_work, codec_delayed_power_down
);
static void nokia770_audio_pwr_down(void)
{
static void nokia770_audio_pwr_down(void)
{