diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 06:00:02 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 06:00:02 +0200 |
commit | 4b6b987969b076298485697bfb0d0e35502642a3 (patch) | |
tree | a8f5ebd6a0b9efbe30272012d759669b0c5ddc13 /arch/mips/include/asm/emma/emma2rh.h | |
parent | sh: Runtime PM pdev hwblk - Solution Engine 7724 (diff) | |
parent | Merge branch 'sh/stable-updates' (diff) | |
download | linux-4b6b987969b076298485697bfb0d0e35502642a3.tar.xz linux-4b6b987969b076298485697bfb0d0e35502642a3.zip |
Merge branch 'master' into sh/hwblk
Diffstat (limited to 'arch/mips/include/asm/emma/emma2rh.h')
-rw-r--r-- | arch/mips/include/asm/emma/emma2rh.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/mips/include/asm/emma/emma2rh.h b/arch/mips/include/asm/emma/emma2rh.h index 30aea91de626..2afb2fe11b30 100644 --- a/arch/mips/include/asm/emma/emma2rh.h +++ b/arch/mips/include/asm/emma/emma2rh.h @@ -1,7 +1,4 @@ /* - * arch/mips/include/asm/emma/emma2rh.h - * This file is EMMA2RH common header. - * * Copyright (C) NEC Electronics Corporation 2005-2006 * * This file based on include/asm-mips/ddb5xxx/ddb5xxx.h |