diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 12:15:15 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 12:15:15 -0500 |
commit | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (patch) | |
tree | 816e5ac643b15c2050c64a7075f0f7e13d86ea09 /arch/arm/mach-at91/Kconfig | |
parent | b1bf9368407ae7e89d8a005bb40beb70a41df539 (diff) | |
parent | 9f33be2c3a80bdc2cc08342dd77fac87652e0548 (diff) |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits)
ARM: Eliminate decompressor -Dstatic= PIC hack
ARM: 5958/1: ARM: U300: fix inverted clk round rate
ARM: 5956/1: misplaced parentheses
ARM: 5955/1: ep93xx: move timer defines into core.c and document
ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c
ARM: 5953/1: ep93xx: fix broken build of clock.c
ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig
ARM: 5949/1: NUC900 add gpio virtual memory map
ARM: 5948/1: Enable timer0 to time4 clock support for nuc910
ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk
ARM: make_coherent(): fix problems with highpte, part 2
MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself
ARM: 5945/1: ep93xx: include correct irq.h in core.c
ARM: 5933/1: amba-pl011: support hardware flow control
ARM: 5930/1: Add PKMAP area description to memory.txt.
ARM: 5929/1: Add checks to detect overlap of memory regions.
ARM: 5928/1: Change type of VMALLOC_END to unsigned long.
ARM: 5927/1: Make delimiters of DMA area globally visibly.
ARM: 5926/1: Add "Virtual kernel memory..." printout.
ARM: 5920/1: OMAP4: Enable L2 Cache
...
Fix up trivial conflict in arch/arm/mach-mx25/clock.c
Diffstat (limited to 'arch/arm/mach-at91/Kconfig')
-rw-r--r-- | arch/arm/mach-at91/Kconfig | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 0b2ee953f16..2db43a5ddd9 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
@@ -89,6 +89,12 @@ config ARCH_AT91CAP9 | |||
89 | select GENERIC_CLOCKEVENTS | 89 | select GENERIC_CLOCKEVENTS |
90 | select HAVE_FB_ATMEL | 90 | select HAVE_FB_ATMEL |
91 | 91 | ||
92 | config ARCH_AT572D940HF | ||
93 | bool "AT572D940HF" | ||
94 | select CPU_ARM926T | ||
95 | select GENERIC_TIME | ||
96 | select GENERIC_CLOCKEVENTS | ||
97 | |||
92 | config ARCH_AT91X40 | 98 | config ARCH_AT91X40 |
93 | bool "AT91x40" | 99 | bool "AT91x40" |
94 | 100 | ||
@@ -390,6 +396,23 @@ endif | |||
390 | 396 | ||
391 | # ---------------------------------------------------------- | 397 | # ---------------------------------------------------------- |
392 | 398 | ||
399 | if ARCH_AT572D940HF | ||
400 | |||
401 | comment "AT572D940HF Board Type" | ||
402 | |||
403 | config MACH_AT572D940HFEB | ||
404 | bool "AT572D940HF-EK" | ||
405 | depends on ARCH_AT572D940HF | ||
406 | select HAVE_AT91_DATAFLASH_CARD | ||
407 | select HAVE_NAND_ATMEL_BUSWIDTH_16 | ||
408 | help | ||
409 | Select this if you are using Atmel's AT572D940HF-EK evaluation kit. | ||
410 | <http://www.atmel.com/products/diopsis/default.asp> | ||
411 | |||
412 | endif | ||
413 | |||
414 | # ---------------------------------------------------------- | ||
415 | |||
393 | if ARCH_AT91X40 | 416 | if ARCH_AT91X40 |
394 | 417 | ||
395 | comment "AT91X40 Board Type" | 418 | comment "AT91X40 Board Type" |