The following commit has been merged in the linux branch: commit c768e67625688517c23f46b31a46e1f7d2de1c71 Author: Hartley Sweeten hartleys@visionengravers.com Date: Wed Oct 21 02:27:01 2009 +0100

ARM: 5769/1: CPU_ARM920T: remove dead Maverick EP9312 URL

Remove the URL listed for Maverick EP9312 since it is not available and modify the help text appropriately.

Signed-off-by: H Hartley Sweeten hsweeten@visionengravers.com Acked-by: Ryan Mallon ryan@bluewatersys.com Signed-off-by: Russell King rmk+kernel@arm.linux.org.uk

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index e993140..9264d81 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -122,10 +122,7 @@ config CPU_ARM920T select CPU_TLB_V4WBI if MMU help The ARM920T is licensed to be produced by numerous vendors, - and is used in the Maverick EP9312 and the Samsung S3C2410. - - More information on the Maverick EP9312 at - http://linuxdevices.com/products/PD2382866068.html. + and is used in the Cirrus EP93xx and the Samsung S3C2410.

Say Y if you want support for the ARM920T processor. Otherwise, say N.