From: Albert H. <he...@us...> - 2008-09-14 19:20:57
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/boot/dts In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4241/arch/powerpc/boot/dts Modified Files: gamecube.dts wii.dts Log Message: Merge 2.6.26. Index: gamecube.dts =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/dts/gamecube.dts,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- gamecube.dts 13 Sep 2008 19:42:52 -0000 1.5 +++ gamecube.dts 14 Sep 2008 19:20:26 -0000 1.6 @@ -20,8 +20,6 @@ chosen { bootargs = "root=/dev/ram0 video=gcn-vifb:tv=auto ip=on force_keyboard_port=4"; - linux,crashkernel-base = <0>; - linux,crashkernel-size = <0>; linux,stdout-path = "/exi@0c006800/usbgecko@0c006814"; }; Index: wii.dts =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/dts/wii.dts,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- wii.dts 13 Sep 2008 19:42:52 -0000 1.7 +++ wii.dts 14 Sep 2008 19:20:26 -0000 1.8 @@ -35,8 +35,6 @@ bootargs = "root=/dev/rvlsda2 video=gcnfb:tv=NTSC force_keyboard_port=4 placeholder_for_additional_kernel_options_targetted_at_hexedit_lovers"; - linux,crashkernel-base = <0>; - linux,crashkernel-size = <0>; linux,stdout-path = "/exi@0d006800/usbgecko@0d006814"; }; |