summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2006-12-17 13:21:05 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-12-17 23:37:47 +0000
commit2343217fb770ef2b172a12186c0cd0526bfb7d0c (patch)
treee45fffca3cf8f5b067b603fa6dedbafee1699646 /drivers/video
parent46a34d68901c12621ef09f11a5d410b92f0643e4 (diff)
downloadlinux-2343217fb770ef2b172a12186c0cd0526bfb7d0c.tar.bz2
[ARM] 4035/1: fix collie compilation
Thanks to Al Viro, here's fix to 2.6.20-rc1-git, so that collie compiles, again. It was broken by INIT_WORK changes. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/sa1100fb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index cd10b18150b8..5d2a4a4b731c 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1200,9 +1200,9 @@ static void set_ctrlr_state(struct sa1100fb_info *fbi, u_int state)
* Our LCD controller task (which is called when we blank or unblank)
* via keventd.
*/
-static void sa1100fb_task(void *dummy)
+static void sa1100fb_task(struct work_struct *w)
{
- struct sa1100fb_info *fbi = dummy;
+ struct sa1100fb_info *fbi = container_of(w, struct sa1100fb_info, task);
u_int state = xchg(&fbi->task_state, -1);
set_ctrlr_state(fbi, state);
@@ -1444,7 +1444,7 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev)
fbi->max_bpp / 8;
init_waitqueue_head(&fbi->ctrlr_wait);
- INIT_WORK(&fbi->task, sa1100fb_task, fbi);
+ INIT_WORK(&fbi->task, sa1100fb_task);
init_MUTEX(&fbi->ctrlr_sem);
return fbi;