diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-03 04:15:11 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-03 04:15:11 -0500 |
| commit | 1fef891761ddcbd7e57ec3961a0fb748003222ac (patch) | |
| tree | d192f1677521e17f1a943f8df570dd6449aa0da8 /drivers/platform/x86/eeepc-wmi.c | |
| parent | d3d4b60b12369eded0ea0c5dffee0888ec4d80cd (diff) | |
| parent | 1d3f33d541312acd34bd2fa780396d111a0f73b1 (diff) | |
Merge branch 'sgu/mxs-core-v8' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38-new
Diffstat (limited to 'drivers/platform/x86/eeepc-wmi.c')
| -rw-r--r-- | drivers/platform/x86/eeepc-wmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c index 462ceab93f87..0d50fbbe2478 100644 --- a/drivers/platform/x86/eeepc-wmi.c +++ b/drivers/platform/x86/eeepc-wmi.c | |||
| @@ -298,8 +298,8 @@ static void eeepc_wmi_notify(u32 value, void *context) | |||
| 298 | kfree(obj); | 298 | kfree(obj); |
| 299 | } | 299 | } |
| 300 | 300 | ||
| 301 | static int store_cpufv(struct device *dev, struct device_attribute *attr, | 301 | static ssize_t store_cpufv(struct device *dev, struct device_attribute *attr, |
| 302 | const char *buf, size_t count) | 302 | const char *buf, size_t count) |
| 303 | { | 303 | { |
| 304 | int value; | 304 | int value; |
| 305 | struct acpi_buffer input = { (acpi_size)sizeof(value), &value }; | 305 | struct acpi_buffer input = { (acpi_size)sizeof(value), &value }; |