git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
[sfrench/cifs-2.6.git]
/
drivers
/
platform
/
x86
/
msi-laptop.c
diff --git
a/drivers/platform/x86/msi-laptop.c
b/drivers/platform/x86/msi-laptop.c
index afd762b58ad9a21e9a28072bae31156b8efd5725..7e9bb6df9d394659deeef7dba46090bc06d129bb 100644
(file)
--- a/
drivers/platform/x86/msi-laptop.c
+++ b/
drivers/platform/x86/msi-laptop.c
@@
-434,7
+434,7
@@
static int dmi_check_cb(const struct dmi_system_id *id)
{
printk(KERN_INFO "msi-laptop: Identified laptop model '%s'.\n",
id->ident);
{
printk(KERN_INFO "msi-laptop: Identified laptop model '%s'.\n",
id->ident);
- return
0
;
+ return
1
;
}
static struct dmi_system_id __initdata msi_dmi_table[] = {
}
static struct dmi_system_id __initdata msi_dmi_table[] = {
@@
-562,15
+562,15
@@
static int rfkill_threeg_set(void *data, bool blocked)
return 0;
}
return 0;
}
-static struct rfkill_ops rfkill_bluetooth_ops = {
+static
const
struct rfkill_ops rfkill_bluetooth_ops = {
.set_block = rfkill_bluetooth_set
};
.set_block = rfkill_bluetooth_set
};
-static struct rfkill_ops rfkill_wlan_ops = {
+static
const
struct rfkill_ops rfkill_wlan_ops = {
.set_block = rfkill_wlan_set
};
.set_block = rfkill_wlan_set
};
-static struct rfkill_ops rfkill_threeg_ops = {
+static
const
struct rfkill_ops rfkill_threeg_ops = {
.set_block = rfkill_threeg_set
};
.set_block = rfkill_threeg_set
};