Subject: [PATCH][2.4] Fixed configration problem for vr41xx

From: Yoichi Yuasa <[email-masked]>
Date: Tue, 10 Feb 2004 06:38:46 +0900

Hello Ralf,

I made a patch for configuration problem for vr41xx.
This patch corrects the problem which occurs when CONFIG_SERIAL is n.

Please apply this patch to v2.4.

Yoichi

diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/casio-e55/setup.c linux/arch/mips/vr41xx/casio-e55/setup.c
--- linux-orig/arch/mips/vr41xx/casio-e55/setup.c	2004-02-06 11:21:47.000000000 +0900
+++ linux/arch/mips/vr41xx/casio-e55/setup.c	2004-02-09 12:11:51.000000000 +0900
@@ -50,5 +50,7 @@
 
 	vr41xx_cmu_init();
 
+#ifdef CONFIG_SERIAL
 	vr41xx_siu_init(SIU_RS232C, 0);
+#endif
 }
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/ibm-workpad/setup.c linux/arch/mips/vr41xx/ibm-workpad/setup.c
--- linux-orig/arch/mips/vr41xx/ibm-workpad/setup.c	2004-02-06 11:21:47.000000000 +0900
+++ linux/arch/mips/vr41xx/ibm-workpad/setup.c	2004-02-09 12:11:51.000000000 +0900
@@ -50,5 +50,7 @@
 
 	vr41xx_cmu_init();
 
+#ifdef CONFIG_SERIAL
 	vr41xx_siu_init(SIU_RS232C, 0);
+#endif
 }
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/tanbac-tb0226/setup.c linux/arch/mips/vr41xx/tanbac-tb0226/setup.c
--- linux-orig/arch/mips/vr41xx/tanbac-tb0226/setup.c	2004-02-09 10:43:38.000000000 +0900
+++ linux/arch/mips/vr41xx/tanbac-tb0226/setup.c	2004-02-09 12:12:36.000000000 +0900
@@ -91,7 +91,9 @@
 
 	vr41xx_cmu_init();
 
+#ifdef CONFIG_SERIAL
 	vr41xx_siu_init(SIU_RS232C, 0);
+#endif
 
 #ifdef CONFIG_PCI
 	vr41xx_pciu_init(&pci_address_map);
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/tanbac-tb0229/setup.c linux/arch/mips/vr41xx/tanbac-tb0229/setup.c
--- linux-orig/arch/mips/vr41xx/tanbac-tb0229/setup.c	2004-02-09 10:43:38.000000000 +0900
+++ linux/arch/mips/vr41xx/tanbac-tb0229/setup.c	2004-02-09 12:11:51.000000000 +0900
@@ -104,8 +104,10 @@
 
 	vr41xx_cmu_init();
 
+#ifdef CONFIG_SERIAL
 	vr41xx_siu_init(SIU_RS232C, 0);
 	vr41xx_dsiu_init();
+#endif
 
 #ifdef CONFIG_PCI
 	vr41xx_pciu_init(&pci_address_map);
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/victor-mpc30x/setup.c linux/arch/mips/vr41xx/victor-mpc30x/setup.c
--- linux-orig/arch/mips/vr41xx/victor-mpc30x/setup.c	2004-02-09 10:43:38.000000000 +0900
+++ linux/arch/mips/vr41xx/victor-mpc30x/setup.c	2004-02-09 12:16:23.000000000 +0900
@@ -96,7 +96,9 @@
 
 	vr41xx_cmu_init();
 
+#ifdef CONFIG_SERIAL
 	vr41xx_siu_init(SIU_RS232C, 0);
+#endif
 
 #ifdef CONFIG_PCI
 	vr41xx_pciu_init(&pci_address_map);
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/zao-capcella/setup.c linux/arch/mips/vr41xx/zao-capcella/setup.c
--- linux-orig/arch/mips/vr41xx/zao-capcella/setup.c	2004-02-09 10:43:38.000000000 +0900
+++ linux/arch/mips/vr41xx/zao-capcella/setup.c	2004-02-09 12:17:10.000000000 +0900
@@ -96,8 +96,10 @@
 
 	vr41xx_cmu_init();
 
+#ifdef CONFIG_SERIAL
 	vr41xx_siu_init(SIU_RS232C, 0);
 	vr41xx_dsiu_init();
+#endif
 
 #ifdef CONFIG_PCI
 	vr41xx_pciu_init(&pci_address_map);

---

From: Ralf Baechle <[email-masked]>
Date: Tue, 10 Feb 2004 15:17:21 +0100

> Please apply this patch to v2.4.

Done,

  Ralf