Module Name: src
Committed By: martin
Date: Sun Oct 11 08:46:43 UTC 2015
Modified Files:
src/sys/arch/alpha/pci: cia.c
Log Message:
Felix Deichmann in PR port-alpha/50326: cosmetic patch for Pyxis attach
message.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/alpha/pci/cia.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/pci/cia.c
diff -u src/sys/arch/alpha/pci/cia.c:1.73 src/sys/arch/alpha/pci/cia.c:1.74
--- src/sys/arch/alpha/pci/cia.c:1.73 Mon Feb 6 02:14:14 2012
+++ src/sys/arch/alpha/pci/cia.c Sun Oct 11 08:46:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cia.c,v 1.73 2012/02/06 02:14:14 matt Exp $ */
+/* $NetBSD: cia.c,v 1.74 2015/10/11 08:46:43 martin Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.73 2012/02/06 02:14:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.74 2015/10/11 08:46:43 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -268,7 +268,6 @@ ciaattach(device_t parent, device_t self
struct pcibus_attach_args pba;
char bits[64];
const char *name;
- int pass;
/* note that we've attached the chipset; can't have 2 CIAs. */
ciafound = 1;
@@ -284,14 +283,12 @@ ciaattach(device_t parent, device_t self
if (ccp->cc_flags & CCF_ISPYXIS) {
name = "Pyxis";
- pass = ccp->cc_rev;
} else {
name = "ALCOR/ALCOR2";
- pass = ccp->cc_rev + 1;
}
aprint_normal(": DECchip 2117x Core Logic Chipset (%s), pass %d\n",
- name, pass);
+ name, ccp->cc_rev + 1);
if (ccp->cc_cnfg) {
snprintb(bits, sizeof(bits), CIA_CSR_CNFG_BITS, ccp->cc_cnfg);
aprint_normal_dev(self, "extended capabilities: %s\n", bits);
