openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Kumar Gala 2005-09-09 13:01:26 -07:00 committed by Linus Torvalds
parent abda24528a
commit 7f6fd5db2d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/ppc/Kconfig
View File

@ -499,11 +499,6 @@ config WINCEPT
MPC821 PowerPC, introduced in 1998 and designed to be used in MPC821 PowerPC, introduced in 1998 and designed to be used in
thin-client machines. Say Y to support it directly. 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 endchoice
choice choice
@ -680,6 +675,11 @@ config MPC834x_SYS
help help
This option enables support for the MPC 834x SYS evaluation board. 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 config EV64360
bool "Marvell-EV64360BP" bool "Marvell-EV64360BP"
help help