diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 10:44:06 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 10:44:06 -0700 |
commit | c145307a110c14d09d5d92ff3c49dc0940e44b80 (patch) | |
tree | cba923818dea8857022de06ffd94ec6b2967aa1f /drivers/platform/x86/msi-laptop.c | |
parent | 5e83f6fbdb020b70c0e413312801424d13c58d68 (diff) | |
parent | 1a14703d6b20010401ca273ac1f07bff7992aa2c (diff) |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (88 commits)
ips driver: make it less chatty
intel_scu_ipc: fix size field for intel_scu_ipc_command
intel_scu_ipc: return -EIO for error condition in busy_loop
intel_scu_ipc: fix data packing of PMIC command on Moorestown
Clean up command packing on MRST.
zero the stack buffer before giving random garbage to the SCU
Fix stack buffer size for IPC writev messages
intel_scu_ipc: Use the new cpu identification function
intel_scu_ipc: tidy up unused bits
Remove indirect read write api support.
intel_scu_ipc: Support Medfield processors
intel_scu_ipc: detect CPU type automatically
x86 plat: limit x86 platform driver menu to X86
acpi ec_sys: Be more cautious about ec write access
acpi ec: Fix possible double io port registration
hp-wmi: acpi_drivers.h is already included through acpi.h two lines below
hp-wmi: Fix mixing up of and/or directive
dell-laptop: make dell_laptop_i8042_filter() static
asus-laptop: fix asus_input_init error path
msi-wmi: make needlessly global symbols static
...
Diffstat (limited to 'drivers/platform/x86/msi-laptop.c')
-rw-r--r-- | drivers/platform/x86/msi-laptop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c index afd762b58ad..7e9bb6df9d3 100644 --- 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); - return 0; + return 1; } static struct dmi_system_id __initdata msi_dmi_table[] = { @@ -562,15 +562,15 @@ static int rfkill_threeg_set(void *data, bool blocked) return 0; } -static struct rfkill_ops rfkill_bluetooth_ops = { +static const struct rfkill_ops rfkill_bluetooth_ops = { .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 }; -static struct rfkill_ops rfkill_threeg_ops = { +static const struct rfkill_ops rfkill_threeg_ops = { .set_block = rfkill_threeg_set }; |