diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 00:57:21 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 00:57:21 -0500 |
| commit | 54c66f6d781e03dc0b23956234963c4911e6d1c0 (patch) | |
| tree | 40619a66ae6d8703a57bf681d087ffeabbffd346 /arch/m32r/mm/mmu.S | |
| parent | 8ce0a7df6e6117d8814e976d4b7ce6a6b2c9cf93 (diff) | |
| parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) | |
Merge branch 'master' into 85xx
Diffstat (limited to 'arch/m32r/mm/mmu.S')
| -rw-r--r-- | arch/m32r/mm/mmu.S | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/m32r/mm/mmu.S b/arch/m32r/mm/mmu.S index 9a4d40b3d6a2..8bb74b10dca7 100644 --- a/arch/m32r/mm/mmu.S +++ b/arch/m32r/mm/mmu.S | |||
| @@ -4,8 +4,6 @@ | |||
| 4 | * Copyright (C) 2001 by Hiroyuki Kondo | 4 | * Copyright (C) 2001 by Hiroyuki Kondo |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | /* $Id: mmu.S,v 1.15 2004/03/16 02:56:27 takata Exp $ */ | ||
| 8 | |||
| 9 | #include <linux/linkage.h> | 7 | #include <linux/linkage.h> |
| 10 | #include <asm/assembler.h> | 8 | #include <asm/assembler.h> |
| 11 | #include <asm/smp.h> | 9 | #include <asm/smp.h> |
| @@ -345,5 +343,4 @@ ENTRY(m32r_otlb_entrys) | |||
| 345 | 343 | ||
| 346 | #endif /* CONFIG_MMU */ | 344 | #endif /* CONFIG_MMU */ |
| 347 | 345 | ||
| 348 | .end | 346 | .end |
| 349 | |||