1 From: Jeff Mahoney <jeffm@suse.com>
2 Subject: [PATCH] novfs: Fix GregorianDay conflict
4 powerpc and sparc have their own non-static versions of GregorianDay
5 that conflict with this one.
7 Signed-off-by: Jeff Mahoney <jeffm@suse.com>
9 fs/novfs/profile.c | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
12 --- a/fs/novfs/profile.c
13 +++ b/fs/novfs/profile.c
14 @@ -314,7 +314,7 @@ static int month_days[12] = {
16 * This only works for the Gregorian calendar - i.e. after 1752 (in the UK)
18 -static void GregorianDay(struct local_rtc_time *tm)
19 +static void NovfsGregorianDay(struct local_rtc_time *tm)
23 @@ -384,7 +384,7 @@ static void private_to_tm(int tim, struc
25 * Determine the day of week
28 + NovfsGregorianDay(tm);
31 char *ctime_r(time_t * clock, char *buf)