diff options
author | Pavel Machek <pavel@ucw.cz> | 2009-11-11 22:26:51 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-12 15:26:00 (GMT) |
commit | 69fd8d24673a8f4f8be5db7f84b5dc9e4ff354c8 (patch) | |
tree | fc8c2fa48255b1ff43ccbb6996c73a0eb9230832 /net/key | |
parent | d62668e1dd830a81ef73ec73386b420cb2a9ca62 (diff) | |
download | linux-fsl-qoriq-69fd8d24673a8f4f8be5db7f84b5dc9e4ff354c8.tar.xz |
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 'net/key')
0 files changed, 0 insertions, 0 deletions