Update of /home/cvs/parisc/linux/arch/parisc/kernel In directory puffin.external.hp.com:/tmp/cvs-serv24123/kernel Modified Files: setup.c Log Message: More minor flubs from my merge with dave.anglin@nrc.ca's code.