diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 11:15:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 11:15:03 -0400 |
| commit | 39adff5f69d6849ca22353a88058c9f8630528c0 (patch) | |
| tree | b0c2d2de77ebc5c97fd19c29b81eeb03549553f8 /arch/arm | |
| parent | 8a4a8918ed6e4a361f4df19f199bbc2d0a89a46c (diff) | |
| parent | e35f95b36e43f67a6f806172555a152c11ea0a78 (diff) | |
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
time, s390: Get rid of compile warning
dw_apb_timer: constify clocksource name
time: Cleanup old CONFIG_GENERIC_TIME references that snuck in
time: Change jiffies_to_clock_t() argument type to unsigned long
alarmtimers: Fix error handling
clocksource: Make watchdog reset lockless
posix-cpu-timers: Cure SMP accounting oddities
s390: Use direct ktime path for s390 clockevent device
clockevents: Add direct ktime programming function
clockevents: Make minimum delay adjustments configurable
nohz: Remove "Switched to NOHz mode" debugging messages
proc: Consider NO_HZ when printing idle and iowait times
nohz: Make idle/iowait counter update conditional
nohz: Fix update_ts_time_stat idle accounting
cputime: Clean up cputime_to_usecs and usecs_to_cputime macros
alarmtimers: Rework RTC device selection using class interface
alarmtimers: Add try_to_cancel functionality
alarmtimers: Add more refined alarm state tracking
alarmtimers: Remove period from alarm structure
alarmtimers: Remove interval cap limit hack
...
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 795126ea4935..8090cad0dd52 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -346,7 +346,6 @@ config ARCH_GEMINI | |||
| 346 | config ARCH_PRIMA2 | 346 | config ARCH_PRIMA2 |
| 347 | bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" | 347 | bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" |
| 348 | select CPU_V7 | 348 | select CPU_V7 |
| 349 | select GENERIC_TIME | ||
| 350 | select NO_IOPORT | 349 | select NO_IOPORT |
| 351 | select GENERIC_CLOCKEVENTS | 350 | select GENERIC_CLOCKEVENTS |
| 352 | select CLKDEV_LOOKUP | 351 | select CLKDEV_LOOKUP |
| @@ -520,7 +519,6 @@ config ARCH_LPC32XX | |||
| 520 | select ARM_AMBA | 519 | select ARM_AMBA |
| 521 | select USB_ARCH_HAS_OHCI | 520 | select USB_ARCH_HAS_OHCI |
| 522 | select CLKDEV_LOOKUP | 521 | select CLKDEV_LOOKUP |
| 523 | select GENERIC_TIME | ||
| 524 | select GENERIC_CLOCKEVENTS | 522 | select GENERIC_CLOCKEVENTS |
| 525 | help | 523 | help |
| 526 | Support for the NXP LPC32XX family of processors | 524 | Support for the NXP LPC32XX family of processors |
| @@ -599,7 +597,6 @@ config ARCH_TEGRA | |||
| 599 | bool "NVIDIA Tegra" | 597 | bool "NVIDIA Tegra" |
| 600 | select CLKDEV_LOOKUP | 598 | select CLKDEV_LOOKUP |
| 601 | select CLKSRC_MMIO | 599 | select CLKSRC_MMIO |
| 602 | select GENERIC_TIME | ||
| 603 | select GENERIC_CLOCKEVENTS | 600 | select GENERIC_CLOCKEVENTS |
| 604 | select GENERIC_GPIO | 601 | select GENERIC_GPIO |
| 605 | select HAVE_CLK | 602 | select HAVE_CLK |
| @@ -914,7 +911,6 @@ config ARCH_VT8500 | |||
| 914 | config ARCH_ZYNQ | 911 | config ARCH_ZYNQ |
| 915 | bool "Xilinx Zynq ARM Cortex A9 Platform" | 912 | bool "Xilinx Zynq ARM Cortex A9 Platform" |
| 916 | select CPU_V7 | 913 | select CPU_V7 |
| 917 | select GENERIC_TIME | ||
| 918 | select GENERIC_CLOCKEVENTS | 914 | select GENERIC_CLOCKEVENTS |
| 919 | select CLKDEV_LOOKUP | 915 | select CLKDEV_LOOKUP |
| 920 | select ARM_GIC | 916 | select ARM_GIC |