diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 00:27:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 00:27:59 +0100 |
| commit | 73829af71fdb8655e7ba4b5a2a6612ad34a75a11 (patch) | |
| tree | 4277605ab142a4f02ff4efad9a7fe522054b7a7f /arch/arm/mach-nomadik | |
| parent | Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/... (diff) | |
| parent | ARM: move VMALLOC_END down temporarily for shmobile (diff) | |
| download | linux-73829af71fdb8655e7ba4b5a2a6612ad34a75a11.tar.xz linux-73829af71fdb8655e7ba4b5a2a6612ad34a75a11.zip | |
Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-nomadik')
| -rw-r--r-- | arch/arm/mach-nomadik/include/mach/vmalloc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-nomadik/include/mach/vmalloc.h b/arch/arm/mach-nomadik/include/mach/vmalloc.h deleted file mode 100644 index f83d574d9445..000000000000 --- a/arch/arm/mach-nomadik/include/mach/vmalloc.h +++ /dev/null @@ -1,2 +0,0 @@ - -#define VMALLOC_END 0xe8000000UL |