Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel_menlow.c
index 29432a50be45..2f795ce2b939 100644
--- a/drivers/platform/x86/intel_menlow.c
+++ b/drivers/platform/x86/intel_menlow.c
@@ -30,6 +30,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/pm.h>
@@ -396,6 +397,7 @@ static int intel_menlow_add_one_attribute(char *name, int mode, void *show,
         if (!attr)
                 return -ENOMEM;
 
+        sysfs_attr_init(&attr->attr.attr); /* That is consistent naming :D */
         attr->attr.attr.name = name;
         attr->attr.attr.mode = mode;
         attr->attr.show = show;
@@ -510,7 +512,7 @@ static int __init intel_menlow_module_init(void)
         /* Looking for sensors in each ACPI thermal zone */
         status = acpi_walk_namespace(ACPI_TYPE_THERMAL, ACPI_ROOT_OBJECT,
                                      ACPI_UINT32_MAX,
-                                     intel_menlow_register_sensor, NULL, NULL);
+                                     intel_menlow_register_sensor, NULL, NULL, NULL);
         if (ACPI_FAILURE(status))
                 return -ENODEV;