Merge branch 'master' into export-slabh

[karo-tx-linux.git] / drivers / platform / x86 / asus-laptop.c

diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 475ab50732abfa1f455b1e18b2cfd893e7c36d20..52262b012abb20c287260d242a61acf7310cc381 100644 (file)
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -49,6 +49,7 @@
 #include <linux/input.h>
 #include <linux/input/sparse-keymap.h>
 #include <linux/rfkill.h>
+#include <linux/slab.h>
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_bus.h>