solve some conflict between Ron and me

This commit is contained in:
Li-Ta Lo 2000-11-29 02:12:37 +00:00
commit dd84fac593

View file

@ -13,7 +13,7 @@ option SERIAL_CONSOLE
# Fixme: this does not effect the Makefile rules for docipl
option HAVE_FRAMEBUFFER
linux ~/src/bios/linux-2.4.0-test11.sis
linux /usr/src/linux
option CMD_LINE='"root=/dev/hda1"'