X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fppc%2Fboot%2Fsimple%2Fmv64x60_stub.c;h=43ae96bb16e25d53a1fa75a48b32c09e8549a2a3;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=46d99245e66cd27aee78ddac41eb4f49debd9de9;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/arch/ppc/boot/simple/mv64x60_stub.c b/arch/ppc/boot/simple/mv64x60_stub.c
index 46d99245e..43ae96bb1 100644
--- a/arch/ppc/boot/simple/mv64x60_stub.c
+++ b/arch/ppc/boot/simple/mv64x60_stub.c
@@ -10,11 +10,15 @@
  * "as is" without any warranty of any kind, whether express or implied.
  */
 
-long	mv64x60_console_baud = 9600;		/* Default baud: 9600 */
-long	mv64x60_mpsc_clk_src = 8;		/* Default clk src: TCLK */
-long	mv64x60_mpsc_clk_freq = 100000000;	/* Default clk freq: 100 MHz */
+#include <linux/config.h>
 
-void
+#if defined(CONFIG_SERIAL_MPSC_CONSOLE)
+long __attribute__ ((weak))	mv64x60_console_baud = 9600;
+long __attribute__ ((weak))	mv64x60_mpsc_clk_src = 8; /* TCLK */
+long __attribute__ ((weak))	mv64x60_mpsc_clk_freq = 100000000;
+#endif
+
+void __attribute__ ((weak))
 mv64x60_board_init(void)
 {
 }