diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 06:30:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 06:30:31 -0400 |
| commit | b0df89868006517417251e02cc4ce5d4b0165885 (patch) | |
| tree | 6800388c633a13f64fd1f7845ce026ca2606522f /arch/c6x | |
| parent | 4ba21e868f4b6e2ce5432055e206edadc6319533 (diff) | |
| parent | 6c634726352f0d796a4b5e6aa9849ee5b45712ce (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig.debug
arch/arm/plat-versatile/Kconfig
Merge fixes:
arch/arm/mach-integrator/Kconfig
drivers/clocksource/Kconfig
Diffstat (limited to 'arch/c6x')
| -rw-r--r-- | arch/c6x/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig index 26e67f0f0051..2f58c61e2812 100644 --- a/arch/c6x/Kconfig +++ b/arch/c6x/Kconfig | |||
| @@ -11,7 +11,7 @@ config TMS320C6X | |||
| 11 | select HAVE_DMA_API_DEBUG | 11 | select HAVE_DMA_API_DEBUG |
| 12 | select HAVE_GENERIC_HARDIRQS | 12 | select HAVE_GENERIC_HARDIRQS |
| 13 | select HAVE_MEMBLOCK | 13 | select HAVE_MEMBLOCK |
| 14 | select HAVE_SPARSE_IRQ | 14 | select SPARSE_IRQ |
| 15 | select OF | 15 | select OF |
| 16 | select OF_EARLY_FLATTREE | 16 | select OF_EARLY_FLATTREE |
| 17 | 17 | ||