diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 15:59:09 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 15:59:09 -0400 |
| commit | b8bc83971cc20cae3c3b65c26a804f350d74960c (patch) | |
| tree | 2573e6367e1806c298344fa023bb49a16cc4d1e4 /arch/arm/Kconfig | |
| parent | 11f0d9311c6e9ed928dc98ce6e9d14c0ee274b05 (diff) | |
| parent | bca7ab316edd819edd0e3d59f9ccb26c6b2173f5 (diff) | |
Merge branch 'pxa/devel' into next/devel2
Conflicts:
arch/arm/mach-s3c2416/s3c2416.c
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 012ff5fbb7e8..863c078ce2e7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -559,6 +559,7 @@ config ARCH_MMP | |||
| 559 | select TICK_ONESHOT | 559 | select TICK_ONESHOT |
| 560 | select PLAT_PXA | 560 | select PLAT_PXA |
| 561 | select SPARSE_IRQ | 561 | select SPARSE_IRQ |
| 562 | select GENERIC_ALLOCATOR | ||
| 562 | help | 563 | help |
| 563 | Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line. | 564 | Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line. |
| 564 | 565 | ||