diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-03-13 23:36:52 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-03-13 23:36:52 -0500 |
| commit | 58a343f22e8ef987b90e34bbef7f1455e3bb5a15 (patch) | |
| tree | fc811fb570639f2083df6d9191b6a8d7cff65352 /drivers/video/s3c2410fb.c | |
| parent | 51c38f9bce274a1e8a90aa457fb433be738f7458 (diff) | |
| parent | 3759fa9c55923f719ae944a3f8fbb029b36f759d (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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> |