From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 27 Nov 2008 12:39:43 +0000 (+0000)
Subject: Merge branch 'clps7500' into devel
X-Git-Tag: v2.6.29-rc1~559^2~85
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=31bccbf39208133415000520c79ebe7b291786df;p=linux.git

Merge branch 'clps7500' into devel

Conflicts:

	arch/arm/Kconfig
---

31bccbf39208133415000520c79ebe7b291786df
diff --cc arch/arm/Kconfig
index a04199771730,6946d95c939e..29759cd25553
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -247,19 -243,8 +247,9 @@@ config ARCH_AT9
  	  This enables support for systems based on the Atmel AT91RM9200,
  	  AT91SAM9 and AT91CAP9 processors.
  
- config ARCH_CLPS7500
- 	bool "Cirrus CL-PS7500FE"
- 	select CPU_ARM710
- 	select TIMER_ACORN
- 	select ISA
- 	select NO_IOPORT
- 	select ARCH_SPARSEMEM_ENABLE
- 	help
- 	  Support for the Cirrus Logic PS7500FE system-on-a-chip.
- 
  config ARCH_CLPS711X
  	bool "Cirrus Logic CLPS711x/EP721x-based"
 +	select CPU_ARM720T
  	help
  	  Support for Cirrus Logic 711x/721x based boards.