diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
| commit | 2e0e943436912ffe0848ece58167edfe754edb96 (patch) | |
| tree | b91919095c74742fa06e2105db6d859bee39b2b4 /arch/arm/mach-h720x/include | |
| parent | a32737e1ca650504f172292dd344eb64c02311f3 (diff) | |
| parent | ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'arch/arm/mach-h720x/include')
| -rw-r--r-- | arch/arm/mach-h720x/include/mach/vmalloc.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-h720x/include/mach/vmalloc.h b/arch/arm/mach-h720x/include/mach/vmalloc.h deleted file mode 100644 index 8520b4a4d4e6..000000000000 --- a/arch/arm/mach-h720x/include/mach/vmalloc.h +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-h720x/include/mach/vmalloc.h | ||
| 3 | */ | ||
| 4 | |||
| 5 | #ifndef __ARCH_ARM_VMALLOC_H | ||
| 6 | #define __ARCH_ARM_VMALLOC_H | ||
| 7 | |||
| 8 | #define VMALLOC_END 0xd0000000UL | ||
| 9 | |||
| 10 | #endif | ||