PERFORCE change 119796 for review

[Bruce M Simpson]

http://perforce.freebsd.org/chv.cgi?CH=119796

Change 119796 by bms at bms_anglepoise on 2007/05/13 21:18:28

	catch up with recent changes

Affected files ...

.. //depot/projects/mips2/src/sys/dev/siba/siba.c#3 edit
.. //depot/projects/mips2/src/sys/mips/mips32/sentry5/files.sentry5#9 edit

Differences ...

==== //depot/projects/mips2/src/sys/dev/siba/siba.c#3 (text+ko) ====

@@ -485,10 +485,10 @@
 	idlo = siba_read_4(sc, idx, SIBA_CORE_IDLO);
 	idhi = siba_read_4(sc, idx, SIBA_CORE_IDHI);
 
-	vendorid = (idhi & SSB_IDHIGH_VC) >> SSB_IDHIGH_VC_SHIFT;
+	vendorid = (idhi & SIBA_IDHIGH_VC) >> SIBA_IDHIGH_VC_SHIFT;
 	devid = ((idhi & 0x8ff0) >> 4);
-	rev = (idhi & SSB_IDHIGH_RCLO);
-	rev |= (idhi & SSB_IDHIGH_RCHI) >> SSB_IDHIGH_RCHI_SHIFT;
+	rev = (idhi & SIBA_IDHIGH_RCLO);
+	rev |= (idhi & SIBA_IDHIGH_RCHI) >> SIBA_IDHIGH_RCHI_SHIFT;
 
 	sdi->sdi_vid = vendorid;
 	sdi->sdi_devid = devid;

==== //depot/projects/mips2/src/sys/mips/mips32/sentry5/files.sentry5#9 (text+ko) ====

@@ -6,10 +6,9 @@
 # which just need to be tweaked for attachment to an SSB system bus.
 
 dev/siba/siba.c					optional siba
-dev/siba/siba_cc.c				optional siba
 dev/siba/siba_pcib.c				optional siba pci
+mips/mips32/sentry5/siba_cc.c			optional siba
 
 #mips/mips32/sentry5/s5_machdep.c		standard
-
 # notyet
 #mips/mips32/sentry5/siba_mips.c			optional siba