diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 11:30:31 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 11:30:31 +0100 |
| commit | b0df89868006517417251e02cc4ce5d4b0165885 (patch) | |
| tree | 6800388c633a13f64fd1f7845ce026ca2606522f /arch/arm/mach-integrator/Kconfig | |
| parent | 4ba21e868f4b6e2ce5432055e206edadc6319533 (diff) | |
| parent | 6c634726352f0d796a4b5e6aa9849ee5b45712ce (diff) | |
| download | talos-obmc-linux-b0df89868006517417251e02cc4ce5d4b0165885.tar.gz talos-obmc-linux-b0df89868006517417251e02cc4ce5d4b0165885.zip | |
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/arm/mach-integrator/Kconfig')
| -rw-r--r-- | arch/arm/mach-integrator/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig index 5a6148ab6dac..350e26636a06 100644 --- a/arch/arm/mach-integrator/Kconfig +++ b/arch/arm/mach-integrator/Kconfig @@ -5,7 +5,6 @@ menu "Integrator Options" config ARCH_INTEGRATOR_AP bool "Support Integrator/AP and Integrator/PP2 platforms" select CLKSRC_MMIO - select HAVE_SCHED_CLOCK select MIGHT_HAVE_PCI select SERIAL_AMBA_PL010 select SERIAL_AMBA_PL010_CONSOLE |
