Upgrading i386 box from 5.5-STABLE to 6.1-STABLE

[Scott Long]

Doug Poland wrote:
> Hello,
> 
> I'm in the middle of an attempt to upgrade an i386 box from 5.5-STABLE
> to 6.1-STABLE.  Just in case it's apropos, the box was recently upgraded
> from 5.2.1-RELEASE to 5.5-STABLE.
> 
> I am following the handbook's "The Canonical Way to Update Your System"
> and have sucessfully cvsup'd RELENG_6 and run make buildworld.
> 
> The problem I'm having is during make buildkernel.  This is the error:
> 
> 
> /usr/src/sys/dev/mii/dcphy.c: In function `dcphy_attach':
> /usr/src/sys/dev/mii/dcphy.c:172: error: `DC_PCI_CSID' undeclared (first use in this function)
> /usr/src/sys/dev/mii/dcphy.c:172: error: (Each undeclared identifier is reported only once
> /usr/src/sys/dev/mii/dcphy.c:172: error: for each function it appears in.)
> *** Error code 1
> 
> Stop in /usr/obj/usr/src/sys/GENERIC.
> *** Error code 1
> 
> Stop in /usr/src.
> *** Error code 1
> 
> Stop in /usr/src.
> 
> 
> I've read /usr/src/UPDATING, google'd and searched the web but to no avail.  
> Any help would be appreciated.
> 
> 

An incomplete and untested commit was done to the stable branch.  I'll
fix it as soon as I have the patch tested.

Scott