diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 15:20:21 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 15:20:21 +0100 |
commit | 7f9c7e28119cf21ae1a035240da3705647d0d06a (patch) | |
tree | c0a1568e21c5ce6cd4112e44071040a3e611a9ec /arch/arm/Kconfig | |
parent | 4af8f24d99d119ed68b27d1b0bd6f2ab2b23ed1b (diff) | |
parent | b476ef059ec9e49d4f2a4280b862b446ef3866e8 (diff) | |
download | linux-7f9c7e28119cf21ae1a035240da3705647d0d06a.tar.bz2 |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ca5aa5aa39e0..7949fe65ecd4 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -510,6 +510,7 @@ config ARCH_MMP select GENERIC_CLOCKEVENTS select TICK_ONESHOT select PLAT_PXA + select SPARSE_IRQ help Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line. @@ -587,6 +588,7 @@ config ARCH_PXA select GENERIC_CLOCKEVENTS select TICK_ONESHOT select PLAT_PXA + select SPARSE_IRQ help Support for Intel/Marvell's PXA2xx/PXA3xx processor line. |