diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:37:34 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:37:34 -0500 |
| commit | 8006fdd6dc387abaa4b683bda4868c879fd76070 (patch) | |
| tree | 314b08f4923dd9ab24930e6b2ac75889c244b154 /arch/ppc/kernel/head_44x.S | |
| parent | 18ce920a6eba05c0d55cdc95fbbadf7e4c4b457b (diff) | |
| parent | 7c3983357fdaef3ae71a0d7081a4b6dcfd869d39 (diff) | |
| download | blackbird-op-linux-8006fdd6dc387abaa4b683bda4868c879fd76070.tar.gz blackbird-op-linux-8006fdd6dc387abaa4b683bda4868c879fd76070.zip | |
Merge branch 'upstream'
Diffstat (limited to 'arch/ppc/kernel/head_44x.S')
| -rw-r--r-- | arch/ppc/kernel/head_44x.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/kernel/head_44x.S b/arch/ppc/kernel/head_44x.S index 8b49679fad54..677c571aa276 100644 --- a/arch/ppc/kernel/head_44x.S +++ b/arch/ppc/kernel/head_44x.S @@ -190,8 +190,8 @@ skpinv: addi r4,r4,1 /* Increment */ /* xlat fields */ lis r4,UART0_PHYS_IO_BASE@h /* RPN depends on SoC */ -#ifndef CONFIG_440EP - ori r4,r4,0x0001 /* ERPN is 1 for second 4GB page */ +#ifdef UART0_PHYS_ERPN + ori r4,r4,UART0_PHYS_ERPN /* Add ERPN if above 4GB */ #endif /* attrib fields */ |
