diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 15:35:09 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 15:35:09 -0400 |
| commit | 86e43a7aff23ce828273cbef6b0d2b0abe095ac8 (patch) | |
| tree | e49b55bd229fe8d77831ef11e218ed7dda3e991b /arch/arm/Kconfig | |
| parent | 6ec4ed82e9cf2ee5c83fd529af69b2c63b004809 (diff) | |
| parent | ace1297f7222ec5d6a33f41e792a21e999551924 (diff) | |
Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt
* 'dt' of git://github.com/hzhuang1/linux:
Documentation: update docs for mmp dt
ARM: dts: refresh dts file for arch mmp
ARM: mmp: support pxa910 with device tree
ARM: mmp: support mmp2 with device tree
gpio: pxa: parse gpio from DTS file
ARM: mmp: support DT in timer
ARM: mmp: support DT in irq
ARM: mmp: append CONFIG_MACH_MMP2_DT
ARM: mmp: fix build issue on mmp with device tree
Includes an update to v3-4-rc5
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3707ff06e50..f10b86495fe 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -633,6 +633,7 @@ config ARCH_MMP | |||
| 633 | select CLKDEV_LOOKUP | 633 | select CLKDEV_LOOKUP |
| 634 | select GENERIC_CLOCKEVENTS | 634 | select GENERIC_CLOCKEVENTS |
| 635 | select GPIO_PXA | 635 | select GPIO_PXA |
| 636 | select IRQ_DOMAIN | ||
| 636 | select TICK_ONESHOT | 637 | select TICK_ONESHOT |
| 637 | select PLAT_PXA | 638 | select PLAT_PXA |
| 638 | select SPARSE_IRQ | 639 | select SPARSE_IRQ |