summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-16 19:28:15 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-16 19:28:15 -0700
commit47455911674d65fba28d43f4135c28ee40c75bac (patch)
treebb109710af11a8e499e971a230fff7316cc49095 /drivers/char
parent5379058b718ac6354ba99cc74d10c28d632dc28a (diff)
parentf510aa3bdb095c5253f6bee9e0f5a3a9ac69ded4 (diff)
downloadlinux-47455911674d65fba28d43f4135c28ee40c75bac.tar.gz
linux-47455911674d65fba28d43f4135c28ee40c75bac.tar.bz2
linux-47455911674d65fba28d43f4135c28ee40c75bac.zip
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Kconfig: Move missplaced NR_CPUS default from SMTC to VSMP. [MIPS] Lockdep: Fix recursion bug. [MIPS] RTLX: Handle copy_*_user return values. [MIPS] RTLX: Protect rtlx_{read,write} with mutex. [MIPS] RTLX: Harden against compiler reordering and optimization. [MIPS] RTLX: Don't use volatile; it's fragile. [MIPS] Lasat: Downgrade 64-bit kernel from experimental to broken. [MIPS] Compat: Fix build if CONFIG_SYSVIPC is disabled. [CHAR] lcd: Fix two warnings. [MIPS] FPU ownership management & preemption fixes [MIPS] Check FCSR for pending interrupts, alternative version [MIPS] IP27, IP35: Fix warnings.
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/lcd.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c
index 5f4fdcf7c96e..1f0962616ee5 100644
--- a/drivers/char/lcd.c
+++ b/drivers/char/lcd.c
@@ -11,9 +11,6 @@
* March 2001: Ported from 2.0.34 by Liam Davies
*
*/
-
-#define RTC_IO_EXTENT 0x10 /*Only really two ports, but... */
-
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/miscdevice.h>
@@ -32,8 +29,6 @@
#include "lcd.h"
-static DEFINE_SPINLOCK(lcd_lock);
-
static int lcd_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg);