Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f6fd5db authored by Kumar Gala's avatar Kumar Gala Committed by Linus Torvalds
Browse files

[PATCH] ppc32: Fix Kconfig mismerge 



Looks like the help comment for MPC834x got merged incorrectly.

Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent abda2452

arch/ppc/Kconfig

+5 −5
Original line number Original line Diff line number Diff line
@@ -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