diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/alpha/defconfig | 6 | ||||
| -rw-r--r-- | arch/alpha/kernel/bios32.c | 26 | ||||
| -rw-r--r-- | arch/alpha/kernel/osf_sys.c | 12 | ||||
| -rw-r--r-- | arch/i386/defconfig | 1 | ||||
| -rw-r--r-- | arch/i386/kernel/setup.c | 3 |
5 files changed, 6 insertions, 42 deletions
diff --git a/arch/alpha/defconfig b/arch/alpha/defconfig index 22adc7f62..9f8cde775 100644 --- a/arch/alpha/defconfig +++ b/arch/alpha/defconfig @@ -42,6 +42,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y CONFIG_BINFMT_AOUT=y CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_MISC is not set CONFIG_BINFMT_EM86=y # CONFIG_PARPORT is not set @@ -141,7 +142,6 @@ CONFIG_SCSI_CONSTANTS=y # CONFIG_SCSI_NCR53C406A is not set # CONFIG_SCSI_NCR53C7xx is not set # CONFIG_SCSI_NCR53C8XX is not set -# CONFIG_SCSI_PPA is not set # CONFIG_SCSI_PAS16 is not set # CONFIG_SCSI_QLOGIC_FAS is not set CONFIG_SCSI_QLOGIC_ISP=y @@ -150,8 +150,6 @@ CONFIG_SCSI_QLOGIC_ISP=y # CONFIG_SCSI_T128 is not set # CONFIG_SCSI_U14_34F is not set # CONFIG_SCSI_ULTRASTOR is not set -# CONFIG_SCSI_MESH is not set -# CONFIG_SCSI_MAC53C94 is not set # # Network device support @@ -164,6 +162,7 @@ CONFIG_NET_ETHERNET=y # CONFIG_NET_VENDOR_3COM is not set # CONFIG_LANCE is not set # CONFIG_NET_VENDOR_SMC is not set +# CONFIG_NET_VENDOR_RACAL is not set # CONFIG_NET_ISA is not set CONFIG_NET_EISA=y # CONFIG_PCNET32 is not set @@ -176,7 +175,6 @@ CONFIG_DE4X5=y # CONFIG_NET_POCKET is not set # CONFIG_FDDI is not set # CONFIG_DLCI is not set -# CONFIG_PLIP is not set # CONFIG_PPP is not set # CONFIG_NET_RADIO is not set # CONFIG_SLIP is not set diff --git a/arch/alpha/kernel/bios32.c b/arch/alpha/kernel/bios32.c index 385fc9494..851d33be7 100644 --- a/arch/alpha/kernel/bios32.c +++ b/arch/alpha/kernel/bios32.c @@ -1182,32 +1182,6 @@ unsigned long pcibios_fixup(unsigned long mem_start, unsigned long mem_end) } -const char *pcibios_strerror (int error) -{ - static char buf[80]; - - switch (error) { - case PCIBIOS_SUCCESSFUL: - return "SUCCESSFUL"; - - case PCIBIOS_FUNC_NOT_SUPPORTED: - return "FUNC_NOT_SUPPORTED"; - - case PCIBIOS_BAD_VENDOR_ID: - return "SUCCESSFUL"; - - case PCIBIOS_DEVICE_NOT_FOUND: - return "DEVICE_NOT_FOUND"; - - case PCIBIOS_BAD_REGISTER_NUMBER: - return "BAD_REGISTER_NUMBER"; - - default: - sprintf (buf, "UNKNOWN RETURN 0x%x", error); - return buf; - } -} - asmlinkage int sys_pciconfig_read( unsigned long bus, unsigned long dfn, diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index f725e2aba..a736704a0 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -135,8 +135,6 @@ asmlinkage int osf_getdirentries(unsigned int fd, struct osf_dirent *dirent, { int error; struct file *file; - struct dentry *dentry; - struct inode *inode; struct osf_dirent_callback buf; error = -EBADF; @@ -147,14 +145,6 @@ asmlinkage int osf_getdirentries(unsigned int fd, struct osf_dirent *dirent, if (!file) goto out; - dentry = file->f_dentry; - if (!dentry) - goto out; - - inode = dentry->d_inode; - if (!inode) - goto out; - buf.dirent = dirent; buf.basep = basep; buf.count = count; @@ -164,7 +154,7 @@ asmlinkage int osf_getdirentries(unsigned int fd, struct osf_dirent *dirent, if (!file->f_op || !file->f_op->readdir) goto out; - error = file->f_op->readdir(inode, file, &buf, osf_filldir); + error = file->f_op->readdir(file, &buf, osf_filldir); if (error < 0) goto out; diff --git a/arch/i386/defconfig b/arch/i386/defconfig index 93f300de7..d4118f63f 100644 --- a/arch/i386/defconfig +++ b/arch/i386/defconfig @@ -178,6 +178,7 @@ CONFIG_EEXPRESS_PRO100=y # CONFIG_NET_RADIO is not set # CONFIG_SLIP is not set # CONFIG_TR is not set +# CONFIG_WAN_DRIVERS is not set # CONFIG_LAPBETHER is not set # CONFIG_X25_ASY is not set diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index d4800f987..590b69c38 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c @@ -257,7 +257,8 @@ static const char * k5model(unsigned int nr) { static const char *model[] = { "SSA5 (PR-75, PR-90, PR-100)", "5k86 (PR-120, PR-133)", - "5k86 (PR-166)", "5k86 (PR-200)", "", "", "K6" + "5k86 (PR-166)", "5k86 (PR-200)", "", "", + "K6(PR-133..PR-166)","K6(PR-133..PR-200)" }; if (nr < sizeof(model)/sizeof(char *)) return model[nr]; |