hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
Pavel Machek 2006-12-17 13:21:05 +01:00 committed by Russell King
parent 46a34d6890
commit 2343217fb7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/video/sa1100fb.c
View File

@ -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) * Our LCD controller task (which is called when we blank or unblank)
* via keventd. * 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); u_int state = xchg(&fbi->task_state, -1);
set_ctrlr_state(fbi, state); set_ctrlr_state(fbi, state);
@ -1444,7 +1444,7 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev)
fbi->max_bpp / 8; fbi->max_bpp / 8;
init_waitqueue_head(&fbi->ctrlr_wait); init_waitqueue_head(&fbi->ctrlr_wait);
INIT_WORK(&fbi->task, sa1100fb_task, fbi); INIT_WORK(&fbi->task, sa1100fb_task);
init_MUTEX(&fbi->ctrlr_sem); init_MUTEX(&fbi->ctrlr_sem);
return fbi; return fbi;