summaryrefslogtreecommitdiffstats
path: root/drivers/char/ppdev.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-10-17 02:02:46 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 04:04:49 +0200
commit68f3e6622bb60c6b477971b56d1913077834fdcd (patch)
tree748598aa546b88c05e7a67ed723934e51b910cad /drivers/char/ppdev.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 (diff)
downloadlinux-68f3e6622bb60c6b477971b56d1913077834fdcd.tar.xz
linux-68f3e6622bb60c6b477971b56d1913077834fdcd.zip
fix adbhid mismerge
This fixes a lost 'key' variable declaration that went missing in a mismerge (commit b981d8b3f5e008ff10d993be633ad00564fc22cd) Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/ppdev.c')
0 files changed, 0 insertions, 0 deletions