A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 18:51:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fixes' into for-linus

Browse source 
Conflicts:

	arch/arm/mach-versatile/core.c
This commit is contained in:
Russell King 2008-10-15 23:16:07 +01:00 • committed by Russell King
commit 2502991560
4009 changed files with 236373 additions and 124037 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/input/misc/sparcspkr.c
View file

@ -249,7 +249,7 @@ static int bbc_remove(struct of_device *op)
return 0;
}
static struct of_device_id bbc_beep_match[] = {
static const struct of_device_id bbc_beep_match[] = {
{
.name = "beep",
.compatible = "SUNW,bbc-beep",
@ -328,7 +328,7 @@ static int grover_remove(struct of_device *op)
return 0;
}
static struct of_device_id grover_beep_match[] = {
static const struct of_device_id grover_beep_match[] = {
{
.name = "beep",
.compatible = "SUNW,smbus-beep",

2
drivers/input/serio/i8042-sparcio.h
View file

@ -87,7 +87,7 @@ static int __devexit sparc_i8042_remove(struct of_device *op)
return 0;
}
static struct of_device_id sparc_i8042_match[] = {
static const struct of_device_id sparc_i8042_match[] = {
{
.name = "8042",
},

4
drivers/input/xen-kbdfront.c
View file

@ -335,11 +335,11 @@ static struct xenbus_driver xenkbd = {
static int __init xenkbd_init(void)
{
if (!is_running_on_xen())
if (!xen_domain())
return -ENODEV;
/* Nothing to do if running in dom0. */
if (is_initial_xendomain())
if (xen_initial_domain())
return -ENODEV;
return xenbus_register_frontend(&xenkbd);