Skip to content

L
linux
Commit ca58a02d authored by Paul Mackerras's avatar Paul Mackerras
Browse files
Options

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

into samba.org:/home/paulus/kernel/for-linus-ppc
parents 1c2b19ec 159d0cc9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
arch/ppc/platforms/4xx/redwood.h
View file @ ca58a02d
...@@ -49,7 +49,7 @@ typedef struct board_info { ...@@ -49,7 +49,7 @@ typedef struct board_info {
#define _ISA_MEM_BASE 0 #define _ISA_MEM_BASE 0
#define PCI_DRAM_OFFSET 0 #define PCI_DRAM_OFFSET 0
#define BASE_BAUD 1312500 #define BASE_BAUD (378000000 / 18 / 16)
#define PPC4xx_MACHINE_NAME "IBM Redwood" #define PPC4xx_MACHINE_NAME "IBM Redwood"
......
arch/ppc/platforms/4xx/redwood5.h
View file @ ca58a02d
...@@ -45,9 +45,7 @@ typedef struct board_info { ...@@ -45,9 +45,7 @@ typedef struct board_info {
#define _ISA_MEM_BASE 0 #define _ISA_MEM_BASE 0
#define PCI_DRAM_OFFSET 0 #define PCI_DRAM_OFFSET 0
/* serail defines moved from ppc4xx_serial.h * #define BASE_BAUD (378000000 / 18 / 16)
*/
#define BASE_BAUD 1267200
#define PPC4xx_MACHINE_NAME "IBM Redwood5" #define PPC4xx_MACHINE_NAME "IBM Redwood5"
......
arch/ppc/platforms/4xx/redwood6.h
View file @ ca58a02d
...@@ -46,7 +46,7 @@ typedef struct board_info { ...@@ -46,7 +46,7 @@ typedef struct board_info {
#define _ISA_MEM_BASE 0 #define _ISA_MEM_BASE 0
#define PCI_DRAM_OFFSET 0 #define PCI_DRAM_OFFSET 0
#define BASE_BAUD 1267200 #define BASE_BAUD (378000000 / 18 / 16)
#define PPC4xx_MACHINE_NAME "IBM Redwood6" #define PPC4xx_MACHINE_NAME "IBM Redwood6"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7