lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Manual merge with Linus.

Browse Source 
Conflicts:
	arch/powerpc/kernel/setup-common.c
	drivers/input/keyboard/hil_kbd.c
	drivers/input/mouse/hil_ptr.c
This commit is contained in:
Dmitry Torokhov
2006-04-02 00:08:05 -05:00
parent 642fde17dc 683aa4012f
commit 95d465fd75
5033 changed files with 258164 additions and 166979 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/input/input.c
View File

@@ -924,7 +924,7 @@ void input_unregister_handler(struct input_handler *handler)
static int input_open_file(struct inode *inode, struct file *file)
{
struct input_handler *handler = input_table[iminor(inode) >> 5];
struct file_operations *old_fops, *new_fops = NULL;
const struct file_operations *old_fops, *new_fops = NULL;
int err;
/* No load-on-demand here? */