summaryrefslogtreecommitdiffstats
path: root/drivers/char/lcd.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-08-28 15:56:11 +1000
committerPaul Mackerras <paulus@samba.org>2007-08-28 15:56:11 +1000
commit35438c4327df18dbf5e7f597b69299119f4a14de (patch)
treea4589d731015db93f2eba8f84ffb1f48a8084020 /drivers/char/lcd.c
parent2f6c9d961081dc7b109eb19166244bcb2a5dfc28 (diff)
parentb07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff)
downloadop-kernel-dev-35438c4327df18dbf5e7f597b69299119f4a14de.zip
op-kernel-dev-35438c4327df18dbf5e7f597b69299119f4a14de.tar.gz
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'drivers/char/lcd.c')
-rw-r--r--drivers/char/lcd.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c
index 1f09626..4fe9206 100644
--- a/drivers/char/lcd.c
+++ b/drivers/char/lcd.c
@@ -25,7 +25,6 @@
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/system.h>
-#include <linux/delay.h>
#include "lcd.h"
OpenPOWER on IntegriCloud