Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...

[pandora-kernel.git] / drivers / gpu / drm / i915 / intel_display.c

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 34d2652..e7356fb 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -28,6 +28,7 @@
 #include <linux/input.h>
 #include <linux/i2c.h>
 #include <linux/kernel.h>
 #include <linux/input.h>
 #include <linux/i2c.h>
 #include <linux/kernel.h>

+#include <linux/slab.h>

 #include "drmP.h"
 #include "intel_drv.h"
 #include "i915_drm.h"
 #include "drmP.h"
 #include "intel_drv.h"
 #include "i915_drm.h"