diff options
author | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
commit | a00428f5b149e36b8225b2a0812742a6dfb07b8c (patch) | |
tree | a78869cd67cf78a0eb091fb0ea5d397734bd6738 /drivers/video/s3c2410fb.c | |
parent | 774fee58c465ea1c7e9775e347ec307bcf2deeb3 (diff) | |
parent | fb5c594c2acc441f0d2d8f457484a0e0e9285db3 (diff) |
Merge ../powerpc-merge
Diffstat (limited to 'drivers/video/s3c2410fb.c')
-rw-r--r-- | drivers/video/s3c2410fb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c index d574dd3c9c8a..9451932fbaf2 100644 --- a/drivers/video/s3c2410fb.c +++ b/drivers/video/s3c2410fb.c | |||
@@ -82,7 +82,6 @@ | |||
82 | #include <linux/fb.h> | 82 | #include <linux/fb.h> |
83 | #include <linux/init.h> | 83 | #include <linux/init.h> |
84 | #include <linux/dma-mapping.h> | 84 | #include <linux/dma-mapping.h> |
85 | #include <linux/string.h> | ||
86 | #include <linux/interrupt.h> | 85 | #include <linux/interrupt.h> |
87 | #include <linux/workqueue.h> | 86 | #include <linux/workqueue.h> |
88 | #include <linux/wait.h> | 87 | #include <linux/wait.h> |