summaryrefslogtreecommitdiffstats
path: root/arch/m32r/lib/delay.c
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-02-12 23:57:21 -0600
committerKumar Gala <galak@kernel.crashing.org>2007-02-12 23:57:21 -0600
commit54c66f6d781e03dc0b23956234963c4911e6d1c0 (patch)
tree40619a66ae6d8703a57bf681d087ffeabbffd346 /arch/m32r/lib/delay.c
parent8ce0a7df6e6117d8814e976d4b7ce6a6b2c9cf93 (diff)
parent17e0e27020d028a790d97699aff85a43af5be472 (diff)
downloadkernel-crypto-54c66f6d781e03dc0b23956234963c4911e6d1c0.tar.gz
kernel-crypto-54c66f6d781e03dc0b23956234963c4911e6d1c0.tar.xz
kernel-crypto-54c66f6d781e03dc0b23956234963c4911e6d1c0.zip
Merge branch 'master' into 85xx
Diffstat (limited to 'arch/m32r/lib/delay.c')
-rw-r--r--arch/m32r/lib/delay.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m32r/lib/delay.c b/arch/m32r/lib/delay.c
index 06382a38c31..59bfc34e0d9 100644
--- a/arch/m32r/lib/delay.c
+++ b/arch/m32r/lib/delay.c
@@ -5,8 +5,6 @@
* Copyright (c) 2004 Hirokazu Takata
*/
-/* $Id$ */
-
#include <linux/param.h>
#ifdef CONFIG_SMP
#include <linux/sched.h>