diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-04 13:52:34 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-04 13:52:34 +0900 |
| commit | baea90ea14b316e4599f000c713e446908a5aef6 (patch) | |
| tree | 17eae40f15832b466121d8f962028472c4568a13 /arch/sh/include | |
| parent | 36239c6704b71da7fb8e2a9429e159a84d0c5a3e (diff) | |
| parent | 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (diff) | |
| download | kernel_samsung_smdk4412-baea90ea14b316e4599f000c713e446908a5aef6.zip kernel_samsung_smdk4412-baea90ea14b316e4599f000c713e446908a5aef6.tar.gz kernel_samsung_smdk4412-baea90ea14b316e4599f000c713e446908a5aef6.tar.bz2 | |
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 9b437f6..0000000 --- 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 0000000..dfe683b --- /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 */ |