Merge branch 'hid-suspend' into picolcd

[pandora-kernel.git] / drivers / hwmon / ibmpex.c

diff --git a/drivers/hwmon/ibmpex.c b/drivers/hwmon/ibmpex.c
index 537d9fb..06d4eaf 100644 (file)
--- a/drivers/hwmon/ibmpex.c
+++ b/drivers/hwmon/ibmpex.c
@@ -25,6 +25,7 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/jiffies.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 
 #define REFRESH_INTERVAL       (2 * HZ)
 #define DRVNAME                        "ibmpex"
@@ -40,7 +41,7 @@
 
 static inline u16 extract_value(const char *data, int offset)
 {
-       return be16_to_cpup((u16 *)&data[offset]);
+       return be16_to_cpup((__be16 *)&data[offset]);
 }
 
 #define TEMP_SENSOR            1