diff options
| author | Pavel Machek <pavel@ucw.cz> | 2009-11-11 14:26:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-12 07:26:00 -0800 |
| commit | 69fd8d24673a8f4f8be5db7f84b5dc9e4ff354c8 (patch) | |
| tree | fc8c2fa48255b1ff43ccbb6996c73a0eb9230832 /drivers/video/msm/mddi.c | |
| parent | d62668e1dd830a81ef73ec73386b420cb2a9ca62 (diff) | |
| download | kernel_samsung_aries-69fd8d24673a8f4f8be5db7f84b5dc9e4ff354c8.zip kernel_samsung_aries-69fd8d24673a8f4f8be5db7f84b5dc9e4ff354c8.tar.gz kernel_samsung_aries-69fd8d24673a8f4f8be5db7f84b5dc9e4ff354c8.tar.bz2 | |
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.c')
| -rw-r--r-- | drivers/video/msm/mddi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c index 5c5a1ad..474421f 100644 --- a/drivers/video/msm/mddi.c +++ b/drivers/video/msm/mddi.c @@ -24,6 +24,7 @@ #include <linux/spinlock.h> #include <linux/clk.h> #include <linux/io.h> +#include <linux/sched.h> #include <mach/msm_iomap.h> #include <mach/irqs.h> #include <mach/board.h> |