tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by

Kumar Gala and committed by
Linus Torvalds 7f6fd5db abda2452

+5 -5
+5 -5
arch/ppc/Kconfig
··· 499 499 MPC821 PowerPC, introduced in 1998 and designed to be used in 500 500 thin-client machines. Say Y to support it directly. 501 501 502 - Be aware that PCI buses can only function when SYS board is plugged 503 - into the PIB (Platform IO Board) board from Freescale which provide 504 - 3 PCI slots. The PIBs PCI initialization is the bootloader's 505 - responsiblilty. 506 - 507 502 endchoice 508 503 509 504 choice ··· 674 679 bool "Freescale MPC834x SYS" 675 680 help 676 681 This option enables support for the MPC 834x SYS evaluation board. 682 + 683 + Be aware that PCI buses can only function when SYS board is plugged 684 + into the PIB (Platform IO Board) board from Freescale which provide 685 + 3 PCI slots. The PIBs PCI initialization is the bootloader's 686 + responsiblilty. 677 687 678 688 config EV64360 679 689 bool "Marvell-EV64360BP"