diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2009-12-14 21:01:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 11:53:32 -0500 |
commit | 4e62b0930223fe2f61094ceb1bbb31b3fe4251c2 (patch) | |
tree | ccfb46317a99d286e63862e22b0d85303267610c /drivers | |
parent | 7707e61c70999a1f9f1fd9ac92e293c198585152 (diff) |
drivers/scsi/sym53c8xx_2/sym_glue.c: rename skip_spaces() to sym_skip_spaces()
To avoid a collision with the newly-added kernel-wide skip_spaces().
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_glue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c index 2b38f6ad6e11..8b955b534a36 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.c +++ b/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) | |||
984 | } | 984 | } |
985 | } | 985 | } |
986 | 986 | ||
987 | static int skip_spaces(char *ptr, int len) | 987 | static int sym_skip_spaces(char *ptr, int len) |
988 | { | 988 | { |
989 | int cnt, c; | 989 | int cnt, c; |
990 | 990 | ||
@@ -1012,7 +1012,7 @@ static int is_keyword(char *ptr, int len, char *verb) | |||
1012 | } | 1012 | } |
1013 | 1013 | ||
1014 | #define SKIP_SPACES(ptr, len) \ | 1014 | #define SKIP_SPACES(ptr, len) \ |
1015 | if ((arg_len = skip_spaces(ptr, len)) < 1) \ | 1015 | if ((arg_len = sym_skip_spaces(ptr, len)) < 1) \ |
1016 | return -EINVAL; \ | 1016 | return -EINVAL; \ |
1017 | ptr += arg_len; len -= arg_len; | 1017 | ptr += arg_len; len -= arg_len; |
1018 | 1018 | ||