diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-08-04 06:52:34 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-04 06:52:34 +0200 |
commit | baea90ea14b316e4599f000c713e446908a5aef6 (patch) | |
tree | 17eae40f15832b466121d8f962028472c4568a13 /arch/sh/include | |
parent | sh: add sh7757lcr board support (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw (diff) | |
download | linux-baea90ea14b316e4599f000c713e446908a5aef6.tar.xz linux-baea90ea14b316e4599f000c713e446908a5aef6.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/sh/include')
-rw-r--r-- | arch/sh/include/asm/lmb.h | 6 | ||||
-rw-r--r-- | arch/sh/include/asm/memblock.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/sh/include/asm/lmb.h b/arch/sh/include/asm/lmb.h deleted file mode 100644 index 9b437f657ffa..000000000000 --- a/arch/sh/include/asm/lmb.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_SH_LMB_H -#define __ASM_SH_LMB_H - -#define LMB_REAL_LIMIT 0 - -#endif /* __ASM_SH_LMB_H */ diff --git a/arch/sh/include/asm/memblock.h b/arch/sh/include/asm/memblock.h new file mode 100644 index 000000000000..dfe683b88075 --- /dev/null +++ b/arch/sh/include/asm/memblock.h @@ -0,0 +1,6 @@ +#ifndef __ASM_SH_MEMBLOCK_H +#define __ASM_SH_MEMBLOCK_H + +#define MEMBLOCK_REAL_LIMIT 0 + +#endif /* __ASM_SH_MEMBLOCK_H */ |