Merge samba.org:/home/paulus/kernel/linux-2.5

into samba.org:/home/paulus/kernel/for-linus-ppc

arch/ppc/platforms/4xx/redwood.h

@@ -49,7 +49,7 @@ typedef struct board_info {
 #define _ISA_MEM_BASE	0
 #define PCI_DRAM_OFFSET	0
 
-#define BASE_BAUD		1312500
+#define BASE_BAUD		(378000000 / 18 / 16)
 
 #define PPC4xx_MACHINE_NAME	"IBM Redwood"
 

arch/ppc/platforms/4xx/redwood5.h

@@ -45,9 +45,7 @@ typedef struct board_info {
 #define _ISA_MEM_BASE	0
 #define PCI_DRAM_OFFSET	0
 
-/* serail defines moved from ppc4xx_serial.h *
- */
-#define BASE_BAUD		1267200
+#define BASE_BAUD		(378000000 / 18 / 16)
 
 #define PPC4xx_MACHINE_NAME	"IBM Redwood5"
 

arch/ppc/platforms/4xx/redwood6.h

@@ -46,7 +46,7 @@ typedef struct board_info {
 #define _ISA_MEM_BASE	0
 #define PCI_DRAM_OFFSET	0
 
-#define BASE_BAUD		1267200
+#define BASE_BAUD		(378000000 / 18 / 16)
 
 #define PPC4xx_MACHINE_NAME	"IBM Redwood6"