diff options
| author | Kumar Gala <galak@freescale.com> | 2005-09-09 13:01:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 13:57:26 -0700 |
| commit | 7f6fd5db2dbc28d475d67f9a6b041fefe1d6f7c8 (patch) | |
| tree | bfdafacff0e29677705ce226c626a09b9dd1f706 | |
| parent | abda24528ac3045511fb59291a2d6ccbddf30eda (diff) | |
| download | kernel-crypto-7f6fd5db2dbc28d475d67f9a6b041fefe1d6f7c8.tar.gz kernel-crypto-7f6fd5db2dbc28d475d67f9a6b041fefe1d6f7c8.tar.xz kernel-crypto-7f6fd5db2dbc28d475d67f9a6b041fefe1d6f7c8.zip | |
[PATCH] ppc32: Fix Kconfig mismerge
Looks like the help comment for MPC834x got merged incorrectly.
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/ppc/Kconfig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 6ab7e5ea5fc..e3f1ce33e64 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig @@ -499,11 +499,6 @@ config WINCEPT MPC821 PowerPC, introduced in 1998 and designed to be used in thin-client machines. Say Y to support it directly. - Be aware that PCI buses can only function when SYS board is plugged - into the PIB (Platform IO Board) board from Freescale which provide - 3 PCI slots. The PIBs PCI initialization is the bootloader's - responsiblilty. - endchoice choice @@ -680,6 +675,11 @@ config MPC834x_SYS help This option enables support for the MPC 834x SYS evaluation board. + Be aware that PCI buses can only function when SYS board is plugged + into the PIB (Platform IO Board) board from Freescale which provide + 3 PCI slots. The PIBs PCI initialization is the bootloader's + responsiblilty. + config EV64360 bool "Marvell-EV64360BP" help |