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

Merge commit 'v2.6.32' into next

Browse Source
This commit is contained in:
Dmitry Torokhov
2009-12-02 23:38:13 -08:00
parent 66d2a5952e 22763c5cf3
commit 467832032c
799 changed files with 13347 additions and 6187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/input/mouse/psmouse-base.c
View File

@@ -597,7 +597,7 @@ static int cortron_detect(struct psmouse *psmouse, bool set_properties)
static int psmouse_extensions(struct psmouse *psmouse,
unsigned int max_proto, bool set_properties)
{
bool synaptics_hardware = true;
bool synaptics_hardware = false;
/*
* We always check for lifebook because it does not disturb mouse
@@ -1689,7 +1689,7 @@ static int psmouse_get_maxproto(char *buffer, struct kernel_param *kp)
{
int type = *((unsigned int *)kp->arg);
return sprintf(buffer, "%s\n", psmouse_protocol_by_type(type)->name);
return sprintf(buffer, "%s", psmouse_protocol_by_type(type)->name);
}
static int __init psmouse_init(void)