projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e902be5 635f025)
Merge branch 'clps7500' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 27 Nov 2008 12:39:43 +0000 (12:39 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 27 Nov 2008 12:39:43 +0000 (12:39 +0000)
Conflicts:

arch/arm/Kconfig

1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
index a041997717303e0c83a68000c56b8a96f2ad0281,6946d95c939e12e95d015d74ff47ac1f7833b1d7..29759cd255539372caaa879794ce2b53b83f1299
--- 1/arch/arm/Kconfig
--- 2/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.
  
John Crispins staging tree