summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-versatile
diff options
context:
space:
mode:
authorDavid Howells2008-09-24 18:48:26 +0200
committerLinus Torvalds2008-09-25 01:38:17 +0200
commitb4f151ff899362fec952c45d166252c9912c041f (patch)
tree7c4453472c21c7d3368b19a504c6841606f36c60 /arch/arm/mach-versatile
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eri... (diff)
downloadkernel-qcow2-linux-b4f151ff899362fec952c45d166252c9912c041f.tar.gz
kernel-qcow2-linux-b4f151ff899362fec952c45d166252c9912c041f.tar.xz
kernel-qcow2-linux-b4f151ff899362fec952c45d166252c9912c041f.zip
MN10300: Move asm-arm/cnt32_to_63.h to include/linux/
Move asm-arm/cnt32_to_63.h to include/linux/ so that MN10300 can make use of it too. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm/mach-versatile')
-rw-r--r--arch/arm/mach-versatile/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index d75e795c893e..b638f10411e8 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -28,8 +28,8 @@
#include <linux/amba/clcd.h>
#include <linux/clocksource.h>
#include <linux/clockchips.h>
+#include <linux/cnt32_to_63.h>
-#include <asm/cnt32_to_63.h>
#include <asm/system.h>
#include <mach/hardware.h>
#include <asm/io.h>