diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-05 18:27:54 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-05 18:27:59 -0500 |
| commit | 73829af71fdb8655e7ba4b5a2a6612ad34a75a11 (patch) | |
| tree | 4277605ab142a4f02ff4efad9a7fe522054b7a7f /arch/arm/mach-u300/include | |
| parent | 742eaa6a6e356a16788ce6530271de89bc4f8fb5 (diff) | |
| parent | 0af362f8440a78b970d5f215e234420fa87d0f3f (diff) | |
Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-u300/include')
| -rw-r--r-- | arch/arm/mach-u300/include/mach/vmalloc.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-u300/include/mach/vmalloc.h b/arch/arm/mach-u300/include/mach/vmalloc.h deleted file mode 100644 index ec423b92b81d..000000000000 --- a/arch/arm/mach-u300/include/mach/vmalloc.h +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * | ||
| 3 | * arch/arm/mach-u300/include/mach/vmalloc.h | ||
| 4 | * | ||
| 5 | * | ||
| 6 | * Copyright (C) 2006-2009 ST-Ericsson AB | ||
| 7 | * License terms: GNU General Public License (GPL) version 2 | ||
| 8 | * Virtual memory allocations | ||
| 9 | * End must be above the I/O registers and on an even 2MiB boundary. | ||
| 10 | * Author: Linus Walleij <linus.walleij@stericsson.com> | ||
| 11 | */ | ||
| 12 | #define VMALLOC_END 0xfe800000UL | ||