diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-27 12:39:43 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-27 12:39:43 +0000 |
| commit | 31bccbf39208133415000520c79ebe7b291786df (patch) | |
| tree | e03b799594ec22613ca2eb7382fc0a98e0cd4b0f /arch/arm/mach-clps7500/include/mach/vmalloc.h | |
| parent | e902be56cbf2a48d96d11d6884767e638d41c712 (diff) | |
| parent | 635f0258e5ae526034486b4ae9020e64bfb7d27e (diff) | |
| download | linux-31bccbf39208133415000520c79ebe7b291786df.tar.gz linux-31bccbf39208133415000520c79ebe7b291786df.tar.bz2 linux-31bccbf39208133415000520c79ebe7b291786df.zip | |
Merge branch 'clps7500' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-clps7500/include/mach/vmalloc.h')
| -rw-r--r-- | arch/arm/mach-clps7500/include/mach/vmalloc.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-clps7500/include/mach/vmalloc.h b/arch/arm/mach-clps7500/include/mach/vmalloc.h deleted file mode 100644 index 8fc5406d1b6d..000000000000 --- a/arch/arm/mach-clps7500/include/mach/vmalloc.h +++ /dev/null @@ -1,4 +0,0 @@ -/* - * arch/arm/mach-clps7500/include/mach/vmalloc.h - */ -#define VMALLOC_END (PAGE_OFFSET + 0x1c000000) |