diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-07-20 14:56:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-07-20 14:56:40 +0000 |
| commit | e308faf24f68e262d92d294a01ddca7a17e76762 (patch) | |
| tree | 22c47cb315811834861f013067878ff664e95abd /fs/nfs/nfsroot.c | |
| parent | 30c6397ce63178fcb3e7963ac247f0a03132aca9 (diff) | |
Sync with Linux 2.1.46.
Diffstat (limited to 'fs/nfs/nfsroot.c')
| -rw-r--r-- | fs/nfs/nfsroot.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c index add3309f3..51cca7c48 100644 --- a/fs/nfs/nfsroot.c +++ b/fs/nfs/nfsroot.c @@ -1,5 +1,5 @@ /* - * $Id: nfsroot.c,v 1.37 1997/06/04 08:28:10 davem Exp $ + * $Id: nfsroot.c,v 1.3 1997/06/17 13:26:56 ralf Exp $ * * Copyright (C) 1995, 1996 Gero Kuhlmann <gero@gkminix.han.de> * @@ -78,7 +78,6 @@ #include <asm/param.h> #include <linux/utsname.h> -#include <linux/nametrans.h> #include <linux/in.h> #include <linux/if.h> #include <linux/inet.h> @@ -833,9 +832,6 @@ __initfunc(static void root_do_bootp_ext(u8 *ext)) root_bootp_string(nfs_path, ext+1, *ext, NFS_MAXPATHLEN); break; } -#ifdef CONFIG_TRANS_NAMES - translations_dirty = 1; -#endif } @@ -1258,9 +1254,6 @@ __initfunc(static void root_nfs_addrs(char *addrs)) system_utsname.domainname[0] = '\0'; user_dev_name[0] = '\0'; bootp_flag = rarp_flag = 1; -#ifdef CONFIG_TRANS_NAMES - translations_dirty = 1; -#endif /* The following is just a shortcut for automatic IP configuration */ if (!strcmp(addrs, "bootp")) { @@ -1306,9 +1299,6 @@ __initfunc(static void root_nfs_addrs(char *addrs)) } strncpy(system_utsname.nodename, ip, __NEW_UTS_LEN); system_utsname.nodename[__NEW_UTS_LEN] = '\0'; -#ifdef CONFIG_TRANS_NAMES - translations_dirty = 1; -#endif break; case 5: strncpy(user_dev_name, ip, IFNAMSIZ); @@ -1342,9 +1332,6 @@ __initfunc(static int root_nfs_setup(void)) if (!system_utsname.nodename[0]) { strncpy(system_utsname.nodename, in_ntoa(myaddr), __NEW_UTS_LEN); system_utsname.nodename[__NEW_UTS_LEN] = '\0'; -#ifdef CONFIG_TRANS_NAMES - translations_dirty = 1; -#endif } /* Set the correct netmask */ |