diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:02:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:02:46 -0500 |
| commit | aed886ce777590eac87f7ce2897d9f8357754331 (patch) | |
| tree | 9a86f2c0a68f8aa43192e51a3155286a5a95e0c8 /arch/arm/mach-davinci/time.c | |
| parent | 67dd2f5a669f48e48ea1013fb80522adca8287f4 (diff) | |
| parent | c16fe26701013b9f55aa554fc0a13a7320b164ee (diff) | |
Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
* 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (69 commits)
davinci: Initial support for Neuros OSD2 platform.
davinci: remove unused variable in arch/arm/mach-davinci/board-sffsdr.c
davinci: fix section mismatch warning in arch/arm/mach-davinci/board-dm646x-evm.c
DaVinci: DM365: Enable DaVinci RTC support for DM365 EVM
DA8xx/OMAP-L1xx: Add high speed SD/MMC capabilities
davinci: DA8XX/OMAP-L1XX: enable cpuidle and regulator in defconfig
davinci: DA850/OMAP-L138: avoid using separate initcall for initializing regulator
davinci: DA850/OMAP-L138 EVM: register for cpuidle support
davinci: DA8XX/OMAP-L1XX: add support for cpuidle driver register
davinci: add CPU idle driver
davinci: DA8XX/OMAP-L1XX: fix compiler warning
davinci: DA850/OMAP-L138: eliminate static function declaration
davinci: DA850/OMAP-L138 EVM: simplify configuration of emac in MII/RMII mode
davinci: DA850/OMAP-L138 EVM: get rid of DA850_UI_EXP config option
davinci: DA850/OMAP-L138 EVM: implement autodetect of RMII PHY
davinci: DA830/OMAP-L137 EVM: do not configure NAND on UI card when MMC/SD is selected
davinci: DA830/OMAP-L137 EVM: use runtime detection for UI card
davinci: DA830/OMAP-L137 EVM: remove ifdefs inside da830_evm_init()
davinci: DA830/OMAP-L137 EVM: fix warning with default config
davinci: Add NAND support for DA830/OMAP-L137 EVM platform
...
Diffstat (limited to 'arch/arm/mach-davinci/time.c')
| -rw-r--r-- | arch/arm/mach-davinci/time.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c index 0d1b6d407b46..42d985beece5 100644 --- a/arch/arm/mach-davinci/time.c +++ b/arch/arm/mach-davinci/time.c | |||
| @@ -14,20 +14,14 @@ | |||
| 14 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 15 | #include <linux/clocksource.h> | 15 | #include <linux/clocksource.h> |
| 16 | #include <linux/clockchips.h> | 16 | #include <linux/clockchips.h> |
| 17 | #include <linux/spinlock.h> | ||
| 18 | #include <linux/io.h> | 17 | #include <linux/io.h> |
| 19 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
| 20 | #include <linux/err.h> | 19 | #include <linux/err.h> |
| 21 | #include <linux/device.h> | ||
| 22 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 23 | 21 | ||
| 24 | #include <mach/hardware.h> | 22 | #include <mach/hardware.h> |
| 25 | #include <asm/system.h> | ||
| 26 | #include <asm/irq.h> | ||
| 27 | #include <asm/mach/irq.h> | 23 | #include <asm/mach/irq.h> |
| 28 | #include <asm/mach/time.h> | 24 | #include <asm/mach/time.h> |
| 29 | #include <asm/errno.h> | ||
| 30 | #include <mach/io.h> | ||
| 31 | #include <mach/cputype.h> | 25 | #include <mach/cputype.h> |
| 32 | #include <mach/time.h> | 26 | #include <mach/time.h> |
| 33 | #include "clock.h" | 27 | #include "clock.h" |