diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 21:02:35 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 21:02:35 -0700 | 
| commit | 367069f16e32e188d4687fe2c3e30f2ca583836f (patch) | |
| tree | 977f87038b75e53af9d132cba2f7a2aecb2fa005 /arch/arm/mach-at91/Kconfig | |
| parent | 81a3c10ce8a7fd5bf9a06bfc38bd417512911831 (diff) | |
| parent | c72dbae971400e466ad9ff16c920cd6d9d8c55a1 (diff) | |
| download | linux-367069f16e32e188d4687fe2c3e30f2ca583836f.tar.bz2 | |
Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc
* 'next/dt' of git://git.linaro.org/people/arnd/arm-soc:
  ARM: gic: use module.h instead of export.h
  ARM: gic: fix irq_alloc_descs handling for sparse irq
  ARM: gic: add OF based initialization
  ARM: gic: add irq_domain support
  irq: support domains with non-zero hwirq base
  of/irq: introduce of_irq_init
  ARM: at91: add at91sam9g20 and Calao USB A9G20 DT support
  ARM: at91: dt: at91sam9g45 family and board device tree files
  arm/mx5: add device tree support for imx51 babbage
  arm/mx5: add device tree support for imx53 boards
  ARM: msm: Add devicetree support for msm8660-surf
  msm_serial: Add devicetree support
  msm_serial: Use relative resources for iomem
Fix up conflicts in arch/arm/mach-at91/{at91sam9260.c,at91sam9g45.c}
Diffstat (limited to 'arch/arm/mach-at91/Kconfig')
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 11 | 
1 files changed, 11 insertions, 0 deletions
| diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 04a85c546abc..a6b7991d7fe8 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -455,6 +455,17 @@ endif  # ---------------------------------------------------------- +comment "Generic Board Type" + +config MACH_AT91SAM_DT +	bool "Atmel AT91SAM Evaluation Kits with device-tree support" +	select USE_OF +	help +	  Select this if you want to experiment device-tree with +	  an Atmel Evaluation Kit. + +# ---------------------------------------------------------- +  comment "AT91 Board Options"  config MTD_AT91_DATAFLASH_CARD |