Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 28735
b: refs/heads/master
c: 4a3ecc6
h: refs/heads/master
i:
  28733: 1d6814a
  28731: fbf6955
  28727: c05a329
  28719: f2bffd3
  28703: d1b3c34
  28671: 73b9451
v: v3
  • Loading branch information
Andrew Morton authored and Paul Mackerras committed Jun 9, 2006
1 parent f36d662 commit 054ad9b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 87af41beb9b70f06f760fc973b793488f2825853
refs/heads/master: 4a3ecc622465dbff7404139a8ad18bf4cb99f836
16 changes: 8 additions & 8 deletions trunk/arch/powerpc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -340,15 +340,15 @@ endchoice

config PPC_PSERIES
depends on PPC_MULTIPLATFORM && PPC64
bool " IBM pSeries & new (POWER5-based) iSeries"
bool "IBM pSeries & new (POWER5-based) iSeries"
select PPC_I8259
select PPC_RTAS
select RTAS_ERROR_LOGGING
select PPC_UDBG_16550
default y

config PPC_CHRP
bool " Common Hardware Reference Platform (CHRP) based machines"
bool "Common Hardware Reference Platform (CHRP) based machines"
depends on PPC_MULTIPLATFORM && PPC32
select PPC_I8259
select PPC_INDIRECT_PCI
Expand All @@ -358,7 +358,7 @@ config PPC_CHRP
default y

config PPC_PMAC
bool " Apple PowerMac based machines"
bool "Apple PowerMac based machines"
depends on PPC_MULTIPLATFORM
select PPC_INDIRECT_PCI if PPC32
select PPC_MPC106 if PPC32
Expand All @@ -374,7 +374,7 @@ config PPC_PMAC64
default y

config PPC_PREP
bool " PowerPC Reference Platform (PReP) based machines"
bool "PowerPC Reference Platform (PReP) based machines"
depends on PPC_MULTIPLATFORM && PPC32 && BROKEN
select PPC_I8259
select PPC_INDIRECT_PCI
Expand All @@ -383,7 +383,7 @@ config PPC_PREP

config PPC_MAPLE
depends on PPC_MULTIPLATFORM && PPC64
bool " Maple 970FX Evaluation Board"
bool "Maple 970FX Evaluation Board"
select U3_DART
select MPIC_BROKEN_U3
select GENERIC_TBSYNC
Expand All @@ -395,7 +395,7 @@ config PPC_MAPLE
For more informations, refer to <http://www.970eval.com>

config PPC_CELL
bool " Cell Broadband Processor Architecture"
bool "Cell Broadband Processor Architecture"
depends on PPC_MULTIPLATFORM && PPC64
select PPC_RTAS
select MMIO_NVRAM
Expand Down Expand Up @@ -831,12 +831,12 @@ config PCI_8260
default y

config 8260_PCI9
bool " Enable workaround for MPC826x erratum PCI 9"
bool "Enable workaround for MPC826x erratum PCI 9"
depends on PCI_8260 && !ADS8272
default y

choice
prompt " IDMA channel for PCI 9 workaround"
prompt "IDMA channel for PCI 9 workaround"
depends on 8260_PCI9

config 8260_PCI9_IDMA1
Expand Down

0 comments on commit 054ad9b

Please sign in to comment.