after upgrading to 3.1 can't compile kernel

[rusty at GARNET.BERKELEY.EDU]

I was unable to use setld because it complained that there wasn't
enough disk space so I just used mt fsf to skip to the ultbase031 and
ultbin031 subsets and extracted and installed them (with no disk space
problems).

Then I copied /genvmunix to /vmunix and rebooted.

Then I removed the previous system configuration file in /usr/sys/conf
(and its corresponding directory in /usr/sys) and ran the command
doconfig.  When compiling the kernel it bombs on the file
data/mscp_data.c.  The error messages are at the end of this message.

Does anybody know what is wrong?  Did I not do something that needed
to be done or screw something up when I did my manual minimal upgrade?


/bin/cc -I. -c -S -DSIGH -DMVAX -DUWS -DUFS -DBSC -DDLI -DRPC -DNFS -DEMULFLT -DINET -DQUOTA -DLAT -DKERNEL -DUPGRADE=0 -DTIMEZONE=480 -DDST=1 -DMAXUSERS=16 -DMAXUPRC=50 -DPHYSMEM=5 -DNCPU=1 -DDMMIN=32 -DDMMAX=1024 -DBUFCACHE=10  ../data/mscp_data.c
"../data/mscp_data.c", line 442: warning: undeclared initializer name DEV_TQL70
"../data/mscp_data.c", line 442: warning: illegal combination of pointer and integer, op =
"../data/mscp_data.c", line 442: illegal initialization
"../data/mscp_data.c", line 442: warning: illegal combination of pointer and integer, op =
"../data/mscp_data.c", line 442: warning: illegal combination of pointer and integer, op =
"../data/mscp_data.c", line 442: illegal initialization
"../data/mscp_data.c", line 444: warning: undeclared initializer name DEV_HSC40
"../data/mscp_data.c", line 444: warning: illegal combination of pointer and integer, op =
"../data/mscp_data.c", line 444: illegal initialization
"../data/mscp_data.c", line 444: warning: illegal combination of pointer and integer, op =
"../data/mscp_data.c", line 444: warning: illegal combination of pointer and integer, op =
"../data/mscp_data.c", line 444: illegal initialization
"../data/mscp_data.c", line 448: warning: undeclared initializer name DEV_TBL70
"../data/mscp_data.c", line 448: warning: illegal combination of pointer and integer, op =
"../data/mscp_data.c", line 448: illegal initialization
"../data/mscp_data.c", line 448: warning: illegal combination of pointer and integer, op =
"../data/mscp_data.c", line 448: warning: illegal combination of pointer and integer, op =
"../data/mscp_data.c", line 448: illegal initialization
"../data/mscp_data.c", line 451: warning: undeclared initializer name DEV_TF85
"../data/mscp_data.c", line 451: warning: illegal combination of pointer and integer, op =
"../data/mscp_data.c", line 451: illegal initialization
"../data/mscp_data.c", line 451: warning: illegal combination of pointer and integer, op =
"../data/mscp_data.c", line 451: warning: illegal combination of pointer and integer, op =
"../data/mscp_data.c", line 451: illegal initialization
"../data/mscp_data.c", line 455: warning: undeclared initializer name DEV_HSX50
"../data/mscp_data.c", line 455: warning: illegal combination of pointer and integer, op =
"../data/mscp_data.c", line 455: illegal initialization
"../data/mscp_data.c", line 455: warning: illegal combination of pointer and integer, op =
"../data/mscp_data.c", line 455: warning: illegal combination of pointer and integer, op =
"../data/mscp_data.c", line 455: illegal initialization
"../data/mscp_data.c", line 521: warning: illegal combination of pointer and integer, op =
"../data/mscp_data.c", line 521: illegal initialization
"../data/mscp_data.c", line 521: warning: illegal combination of pointer and integer, op =
*** Error code 1

Stop.