diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-03-12 03:25:53 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-03-12 03:25:53 -0500 |
| commit | 9c3c8afccb6a163fd2be739f511e863eab668702 (patch) | |
| tree | e587a5377ada98fed8cfa6c8ee63125361f2818a /arch/arm/plat-spear/include/plat/vmalloc.h | |
| parent | 290293eda2c6dd368476d71433bdef07c39a6829 (diff) | |
| parent | a5abba989deceb731047425812d268daf7536575 (diff) | |
Merge commit 'v2.6.38-rc8' into spi/next
Conflicts:
drivers/spi/pxa2xx_spi_pci.c
Diffstat (limited to 'arch/arm/plat-spear/include/plat/vmalloc.h')
| -rw-r--r-- | arch/arm/plat-spear/include/plat/vmalloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-spear/include/plat/vmalloc.h b/arch/arm/plat-spear/include/plat/vmalloc.h index 09e9372aea21..8c8b24d07046 100644 --- a/arch/arm/plat-spear/include/plat/vmalloc.h +++ b/arch/arm/plat-spear/include/plat/vmalloc.h | |||
| @@ -14,6 +14,6 @@ | |||
| 14 | #ifndef __PLAT_VMALLOC_H | 14 | #ifndef __PLAT_VMALLOC_H |
| 15 | #define __PLAT_VMALLOC_H | 15 | #define __PLAT_VMALLOC_H |
| 16 | 16 | ||
| 17 | #define VMALLOC_END 0xF0000000 | 17 | #define VMALLOC_END 0xF0000000UL |
| 18 | 18 | ||
| 19 | #endif /* __PLAT_VMALLOC_H */ | 19 | #endif /* __PLAT_VMALLOC_H */ |