diff options
| author | Paul Mackerras <paulus@samba.org> | 2003-04-28 13:19:30 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2003-04-28 13:19:30 +1000 |
| commit | ca58a02d2abd9723821caebf01ff66108751e649 (patch) | |
| tree | 7e74b79ebcec9c6dd4e4d14b8463535a60987c6c | |
| parent | 1c2b19ec1920b02b7d3dbd8221973b14399b46f9 (diff) | |
| parent | 159d0cc9487a5d7160112ab6013a9fd5a75eb7c8 (diff) | |
Merge samba.org:/home/paulus/kernel/linux-2.5
into samba.org:/home/paulus/kernel/for-linus-ppc
| -rw-r--r-- | arch/ppc/platforms/4xx/redwood.h | 2 | ||||
| -rw-r--r-- | arch/ppc/platforms/4xx/redwood5.h | 4 | ||||
| -rwxr-xr-x | arch/ppc/platforms/4xx/redwood6.h | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/arch/ppc/platforms/4xx/redwood.h b/arch/ppc/platforms/4xx/redwood.h index da544898e6ae..f52bc147ca63 100644 --- a/arch/ppc/platforms/4xx/redwood.h +++ b/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" diff --git a/arch/ppc/platforms/4xx/redwood5.h b/arch/ppc/platforms/4xx/redwood5.h index 42bc41ac8a24..91b761635166 100644 --- a/arch/ppc/platforms/4xx/redwood5.h +++ b/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" diff --git a/arch/ppc/platforms/4xx/redwood6.h b/arch/ppc/platforms/4xx/redwood6.h index 84dfef719222..bbb61122497d 100755 --- a/arch/ppc/platforms/4xx/redwood6.h +++ b/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" |