From: Peter Hurley Date: Sat, 15 Jun 2013 11:04:46 +0000 (-0400) Subject: tty: Fix tty_ldisc_lock name collision X-Git-Tag: v3.12-rc1~182^2~227 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=137084bbaddf4f6dde948ef3a14e18ba0754cc0d;p=pandora-kernel.git tty: Fix tty_ldisc_lock name collision The file scope spinlock identifier, tty_ldisc_lock, will collide with the file scope lock function tty_ldisc_lock() so rename it. Signed-off-by: Peter Hurley Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed