summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-07-16 11:08:33 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-16 11:08:33 +0100
commite910b63d009701ad4ebbeb089aba35707fa5d68e (patch)
treef7fdd3c2b1d9165d69a778c434e664f8789f4401 /arch/arm/Kconfig
parent2f7989efd4398d92b8adffce2e07dd043a0895fe (diff)
parentc9c6fe5033191d82e1d819105485c795062107fd (diff)
downloadop-kernel-dev-e910b63d009701ad4ebbeb089aba35707fa5d68e.zip
op-kernel-dev-e910b63d009701ad4ebbeb089aba35707fa5d68e.tar.gz
Merge branch 'l7200' into devel
Conflicts: arch/arm/configs/lusl7200_defconfig
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig16
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 98922f7..78589a1 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -439,21 +439,6 @@ config ARCH_IXP4XX
help
Support for Intel's IXP4XX (XScale) family of processors.
-config ARCH_L7200
- bool "LinkUp-L7200"
- select CPU_ARM720T
- select FIQ
- select ARCH_USES_GETTIMEOFFSET
- help
- Say Y here if you intend to run this kernel on a LinkUp Systems
- L7200 Software Development Board which uses an ARM720T processor.
- Information on this board can be obtained at:
-
- <http://www.linkupsys.com/>
-
- If you have any questions or comments about the Linux kernel port
- to this board, send e-mail to <sjhill@cotw.com>.
-
config ARCH_DOVE
bool "Marvell Dove"
select PCI
@@ -1185,7 +1170,6 @@ source kernel/Kconfig.preempt
config HZ
int
- default 128 if ARCH_L7200
default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210
default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
default AT91_TIMER_HZ if ARCH_AT91
OpenPOWER on IntegriCloud