From 2699cae894e1530386b47a85539bd294fd240f8b Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 14 Dec 2009 18:01:02 -0800
Subject: [PATCH] --- yaml --- r: 176373 b: refs/heads/master c:
 4e62b0930223fe2f61094ceb1bbb31b3fe4251c2 h: refs/heads/master i:   176371:
 6419f07dfd1ab404e9a76dcac7d674c8f9bd47d7 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/scsi/sym53c8xx_2/sym_glue.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 61d3e2c59d8c..81a32e6f8574 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7707e61c70999a1f9f1fd9ac92e293c198585152
+refs/heads/master: 4e62b0930223fe2f61094ceb1bbb31b3fe4251c2
diff --git a/trunk/drivers/scsi/sym53c8xx_2/sym_glue.c b/trunk/drivers/scsi/sym53c8xx_2/sym_glue.c
index 2b38f6ad6e11..8b955b534a36 100644
--- a/trunk/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/trunk/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -984,7 +984,7 @@ static void sym_exec_user_command (struct sym_hcb *np, struct sym_usrcmd *uc)
 	}
 }
 
-static int skip_spaces(char *ptr, int len)
+static int sym_skip_spaces(char *ptr, int len)
 {
 	int cnt, c;
 
@@ -1012,7 +1012,7 @@ static int is_keyword(char *ptr, int len, char *verb)
 }
 
 #define SKIP_SPACES(ptr, len)						\
-	if ((arg_len = skip_spaces(ptr, len)) < 1)			\
+	if ((arg_len = sym_skip_spaces(ptr, len)) < 1)			\
 		return -EINVAL;						\
 	ptr += arg_len; len -= arg_len;