diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 16:15:52 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 16:15:52 +0000 |
commit | f8ce25476d5f12ffa29b885e49c38cd95053437e (patch) | |
tree | 640fbdaacbf375f13feaf0eee49306d90b778b8a /include | |
parent | de1d815fccee1f4766a7e56054ab0ec3f6f3a7db (diff) | |
download | blackbird-op-linux-f8ce25476d5f12ffa29b885e49c38cd95053437e.tar.gz blackbird-op-linux-f8ce25476d5f12ffa29b885e49c38cd95053437e.zip |
[ARM] Move asm/hardware/clock.h to linux/clk.h
This is needs to be visible to other architectures using the AMBA
bus and peripherals.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-arm/arch-omap/system.h | 3 | ||||
-rw-r--r-- | include/linux/clk.h (renamed from include/asm-arm/hardware/clock.h) | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-arm/arch-omap/system.h b/include/asm-arm/arch-omap/system.h index 9af415d2944a..6724a81bd10b 100644 --- a/include/asm-arm/arch-omap/system.h +++ b/include/asm-arm/arch-omap/system.h @@ -5,8 +5,9 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H #include <linux/config.h> +#include <linux/clk.h> + #include <asm/mach-types.h> -#include <asm/hardware/clock.h> #include <asm/hardware.h> #include <asm/arch/prcm.h> diff --git a/include/asm-arm/hardware/clock.h b/include/linux/clk.h index 69f33215e437..12848f81bb37 100644 --- a/include/asm-arm/hardware/clock.h +++ b/include/linux/clk.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/clock.h + * linux/include/linux/clk.h * * Copyright (C) 2004 ARM Limited. * Written by Deep Blue Solutions Limited. |