diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-03-03 00:51:24 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-03-03 00:51:24 +0100 |
| commit | d6fa4ec20db6bd0b403d2d99fd9423e6c0f3f845 (patch) | |
| tree | e9ddb16309d2b546a400593afc07846ce9ed6746 /include/linux | |
| parent | dc1cfc34b2a07c5441d68ca21ae4296822ee4df6 (diff) | |
| parent | 1ff6b9489fbc737e3e2bc7660b92cebbfaea5247 (diff) | |
Conflicts:
arch/arm/mach-tegra/common.c
drivers/ata/ahci-tegra.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nvmap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/nvmap.h b/include/linux/nvmap.h index 692956b2fc4f..9cc978ec5a7f 100644 --- a/include/linux/nvmap.h +++ b/include/linux/nvmap.h @@ -124,6 +124,8 @@ void nvmap_unpin_handles(struct nvmap_client *client, struct nvmap_handle_ref *nvmap_duplicate_handle_id(struct nvmap_client *client, unsigned long id); +int nvmap_mark_global(struct nvmap_client *client, struct nvmap_handle_ref *r); + struct nvmap_platform_carveout { const char *name; unsigned int usage_mask; |