From 13c9d2fa5274564e8069a562aa61a8881ec4350b Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Mon, 28 Apr 2008 02:13:53 -0700
Subject: [PATCH] --- yaml --- r: 94074 b: refs/heads/master c:
 3595726ac349ca9682703535e9a999c4f08c2d80 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/um/drivers/line.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e1055be78192..6563e28bf40f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3af9c5bed1b8f284f3d7d479c77adf60ad059e91
+refs/heads/master: 3595726ac349ca9682703535e9a999c4f08c2d80
diff --git a/trunk/arch/um/drivers/line.c b/trunk/arch/um/drivers/line.c
index 2c898c4d6b6a..10b86e1cc659 100644
--- a/trunk/arch/um/drivers/line.c
+++ b/trunk/arch/um/drivers/line.c
@@ -304,7 +304,7 @@ int line_ioctl(struct tty_struct *tty, struct file * file,
 				break;
 		if (i == ARRAY_SIZE(tty_ioctls)) {
 			printk(KERN_ERR "%s: %s: unknown ioctl: 0x%x\n",
-			       __FUNCTION__, tty->name, cmd);
+			       __func__, tty->name, cmd);
 		}
 		ret = -ENOIOCTLCMD;
 		break;