summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-17 08:13:11 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-17 08:13:11 -0800
commita5222049f3e26c21ecd65bfcc9b666d4c813933b (patch)
treef4474d66f0150b8dba8675b373a90d5509af9d75 /drivers
parent7054ec7f86cada917626c05fe461abccca816d3b (diff)
parentd9db950cfa3d674ee834d980c329efdf8e4a0568 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/s3c2410fb.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index d574dd3c9c8..9451932fbaf 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -82,7 +82,6 @@
#include <linux/fb.h>
#include <linux/init.h>
#include <linux/dma-mapping.h>
-#include <linux/string.h>
#include <linux/interrupt.h>
#include <linux/workqueue.h>
#include <linux/wait.h>