git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable/bug-fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
input
/
mouse
/
synaptics.c
diff --git
a/drivers/input/mouse/synaptics.c
b/drivers/input/mouse/synaptics.c
index
aa186cf
..
e06e045
100644
(file)
--- a/
drivers/input/mouse/synaptics.c
+++ b/
drivers/input/mouse/synaptics.c
@@
-836,8
+836,8
@@
static const struct dmi_system_id __initconst toshiba_dmi_table[] = {
},
},
- { }
#endif
+ { }
};
static bool broken_olpc_ec;
@@
-851,8
+851,8
@@
static const struct dmi_system_id __initconst olpc_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "XO"),
},
},
- { }
#endif
+ { }
};
void __init synaptics_module_init(void)