diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 10:32:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 10:32:56 -0500 |
| commit | 4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch) | |
| tree | 50774592eaba942cf378fca731d307f901b737b7 /drivers/video/s3c2410fb.c | |
| parent | eb16292ba8a6655a560ab10a7d73a7816f0c0ac0 (diff) | |
| parent | 8576762ff5d109b841fcf4e7d3883e0cf794f3cf (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Manual #include fixups for clashes - there may be some unnecessary
Diffstat (limited to 'drivers/video/s3c2410fb.c')
| -rw-r--r-- | drivers/video/s3c2410fb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c index 3862d3cb1fb2..3cef90456a4b 100644 --- a/drivers/video/s3c2410fb.c +++ b/drivers/video/s3c2410fb.c | |||
| @@ -86,6 +86,7 @@ | |||
| 86 | #include <linux/interrupt.h> | 86 | #include <linux/interrupt.h> |
| 87 | #include <linux/workqueue.h> | 87 | #include <linux/workqueue.h> |
| 88 | #include <linux/wait.h> | 88 | #include <linux/wait.h> |
| 89 | #include <linux/platform_device.h> | ||
| 89 | 90 | ||
| 90 | #include <asm/io.h> | 91 | #include <asm/io.h> |
| 91 | #include <asm/uaccess.h> | 92 | #include <asm/uaccess.h> |