diff options
author | Paul Mackerras <paulus@samba.org> | 2007-07-11 13:28:26 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-07-11 13:28:26 +1000 |
commit | bf22f6fe2d72b4d7e9035be8ceb340414cf490e3 (patch) | |
tree | 14085d90de0428316479fe6de8a0c6d32e6e65e2 /arch/powerpc/boot/dts/prpmc2800.dts | |
parent | lots-of-architectures: enable arbitary speed tty support (diff) | |
parent | [POWERPC] Create add_rtc() function to enable the RTC CMOS driver (diff) | |
download | linux-dev-bf22f6fe2d72b4d7e9035be8ceb340414cf490e3.tar.xz linux-dev-bf22f6fe2d72b4d7e9035be8ceb340414cf490e3.zip |
Merge branch 'for-2.6.23' into merge
Diffstat (limited to 'arch/powerpc/boot/dts/prpmc2800.dts')
-rw-r--r-- | arch/powerpc/boot/dts/prpmc2800.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts index 568965a022b9..699d0df574d5 100644 --- a/arch/powerpc/boot/dts/prpmc2800.dts +++ b/arch/powerpc/boot/dts/prpmc2800.dts @@ -309,7 +309,7 @@ }; chosen { - bootargs = "ip=on console=ttyMM0"; + bootargs = "ip=on"; linux,stdout-path = "/mv64x60@f1000000/mpsc@8000"; }; }; |