diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-07-24 11:49:13 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-24 11:49:13 -0400 |
| commit | 4e4f62bf7396fca48efe61513640ee399a6046e3 (patch) | |
| tree | 42a503af02d9806bcc05e5fcc2cd53f9bd45b0c2 /arch/microblaze/include | |
| parent | 9e3288dc9a94fab5ea87db42177d3a9e0345a614 (diff) | |
| parent | b37fa16e78d6f9790462b3181602a26b5af36260 (diff) | |
Merge commit 'v2.6.35-rc6' into devicetree/next
Conflicts:
arch/sparc/kernel/prom_64.c
Diffstat (limited to 'arch/microblaze/include')
| -rw-r--r-- | arch/microblaze/include/asm/memblock.h (renamed from arch/microblaze/include/asm/lmb.h) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/microblaze/include/asm/lmb.h b/arch/microblaze/include/asm/memblock.h index a0a0a929c293..f9c2fa331d2a 100644 --- a/arch/microblaze/include/asm/lmb.h +++ b/arch/microblaze/include/asm/memblock.h | |||
| @@ -6,12 +6,12 @@ | |||
| 6 | * for more details. | 6 | * for more details. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #ifndef _ASM_MICROBLAZE_LMB_H | 9 | #ifndef _ASM_MICROBLAZE_MEMBLOCK_H |
| 10 | #define _ASM_MICROBLAZE_LMB_H | 10 | #define _ASM_MICROBLAZE_MEMBLOCK_H |
| 11 | 11 | ||
| 12 | /* LMB limit is OFF */ | 12 | /* MEMBLOCK limit is OFF */ |
| 13 | #define LMB_REAL_LIMIT 0xFFFFFFFF | 13 | #define MEMBLOCK_REAL_LIMIT 0xFFFFFFFF |
| 14 | 14 | ||
| 15 | #endif /* _ASM_MICROBLAZE_LMB_H */ | 15 | #endif /* _ASM_MICROBLAZE_MEMBLOCK_H */ |
| 16 | 16 | ||
| 17 | 17 | ||