diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:25:15 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:25:27 -0500 |
| commit | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (patch) | |
| tree | b835312e76fe323de3e1cbbb0d15fca5a3f7ef9c /arch/arm/mach-tcc8k/common.h | |
| parent | 2e0e943436912ffe0848ece58167edfe754edb96 (diff) | |
| parent | 0575fb754dbfc32a01f297e778533340a533ec68 (diff) | |
Merge branch 'restart' into for-linus
Conflicts:
arch/arm/mach-exynos/cpu.c
The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
Diffstat (limited to 'arch/arm/mach-tcc8k/common.h')
| -rw-r--r-- | arch/arm/mach-tcc8k/common.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/mach-tcc8k/common.h b/arch/arm/mach-tcc8k/common.h deleted file mode 100644 index 705690add395..000000000000 --- a/arch/arm/mach-tcc8k/common.h +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | #ifndef MACH_TCC8K_COMMON_H | ||
| 2 | #define MACH_TCC8K_COMMON_H | ||
| 3 | |||
| 4 | #include <linux/platform_device.h> | ||
| 5 | |||
| 6 | extern struct platform_device tcc_nand_device; | ||
| 7 | |||
| 8 | struct clk; | ||
| 9 | |||
| 10 | extern void tcc_clocks_init(unsigned long xi_freq, unsigned long xti_freq); | ||
| 11 | extern void tcc8k_timer_init(struct clk *clock, void __iomem *base, int irq); | ||
| 12 | extern void tcc8k_init_irq(void); | ||
| 13 | extern void tcc8k_map_common_io(void); | ||
| 14 | |||
| 15 | #endif | ||