diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:33:32 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:33:32 -0500 |
| commit | 404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34 (patch) | |
| tree | 99119edc53fdca73ed7586829b8ee736e09440b3 /arch/arm/mach-cns3xxx/core.h | |
| parent | 28cdac6690cb113856293bf79b40de33dbd8f974 (diff) | |
| parent | 1051b9f0f9eab8091fe3bf98320741adf36b4cfa (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/clock.h
Diffstat (limited to 'arch/arm/mach-cns3xxx/core.h')
| -rw-r--r-- | arch/arm/mach-cns3xxx/core.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-cns3xxx/core.h b/arch/arm/mach-cns3xxx/core.h index ef9e5116b1a9..ffeb3a8b73ba 100644 --- a/arch/arm/mach-cns3xxx/core.h +++ b/arch/arm/mach-cns3xxx/core.h | |||
| @@ -16,7 +16,5 @@ extern struct sys_timer cns3xxx_timer; | |||
| 16 | void __init cns3xxx_map_io(void); | 16 | void __init cns3xxx_map_io(void); |
| 17 | void __init cns3xxx_init_irq(void); | 17 | void __init cns3xxx_init_irq(void); |
| 18 | void cns3xxx_power_off(void); | 18 | void cns3xxx_power_off(void); |
| 19 | void cns3xxx_pwr_power_up(unsigned int block); | ||
| 20 | void cns3xxx_pwr_power_down(unsigned int block); | ||
| 21 | 19 | ||
| 22 | #endif /* __CNS3XXX_CORE_H */ | 20 | #endif /* __CNS3XXX_CORE_H */ |