summaryrefslogtreecommitdiff
path: root/drivers/video/msm/mddi_client_nt35399.c
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2009-11-11 14:26:51 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-12 07:26:00 -0800
commit69fd8d24673a8f4f8be5db7f84b5dc9e4ff354c8 (patch)
treefc8c2fa48255b1ff43ccbb6996c73a0eb9230832 /drivers/video/msm/mddi_client_nt35399.c
parentd62668e1dd830a81ef73ec73386b420cb2a9ca62 (diff)
drivers/video/msm: update to new kernel
TASK_INTERRUPTIBLE and friends are now only available after including <linux/sched.h>, so include it when needed. bus_id is no longer available/necessary, so remove that. Android pmem driver is not available in mainline, so remove its hooks from drivers/video. Signed-off-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/msm/mddi_client_nt35399.c')
-rw-r--r--drivers/video/msm/mddi_client_nt35399.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/msm/mddi_client_nt35399.c b/drivers/video/msm/mddi_client_nt35399.c
index 9c78050ac799..c9e9349451cb 100644
--- a/drivers/video/msm/mddi_client_nt35399.c
+++ b/drivers/video/msm/mddi_client_nt35399.c
@@ -19,6 +19,7 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
+#include <linux/sched.h>
#include <linux/gpio.h>
#include <mach/msm_fb.h>