diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 11:13:11 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 11:13:11 -0500 |
| commit | a5222049f3e26c21ecd65bfcc9b666d4c813933b (patch) | |
| tree | f4474d66f0150b8dba8675b373a90d5509af9d75 /drivers | |
| parent | 7054ec7f86cada917626c05fe461abccca816d3b (diff) | |
| parent | d9db950cfa3d674ee834d980c329efdf8e4a0568 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers')
| -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> |