TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 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
parent 7e69a8c4d0 a9ff8f6462
commit 2502991560
4009 changed files with 236347 additions and 124011 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/input/misc/sparcspkr.c
+2 -2
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",
drivers/input/serio/i8042-sparcio.h
+1 -1
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",
},
drivers/input/xen-kbdfront.c
+2 -2
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);