diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:52:26 -0600 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:52:26 -0600 |
commit | 7baca6ad0ef09c8a78d798c93a3ce25336e8f50f (patch) | |
tree | f3dd43243be6e840dc2b0386e91c4146a4f51620 /arch/m32r/lib/delay.c | |
parent | 06d8bf64ba25db42fcc60d2da2268ac22af94e77 (diff) | |
parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) |
Merge branch 'master' into for_paulus
Diffstat (limited to 'arch/m32r/lib/delay.c')
-rw-r--r-- | arch/m32r/lib/delay.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m32r/lib/delay.c b/arch/m32r/lib/delay.c index 06382a38c318..59bfc34e0d9f 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> |