diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2012-11-05 18:58:32 +0400 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-11-05 18:58:32 +0400 |
commit | 3fd9396af83a1e69eaf9ebb573207431d8f265b6 (patch) | |
tree | f221f5777695de71ea97423c67438bca1746e26c /arch/arm/mm/vmregion.h | |
parent | e3978cded41dc7b364e74037f56d6bc558c11fd7 (diff) | |
parent | 3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff) | |
download | linux-3fd9396af83a1e69eaf9ebb573207431d8f265b6.tar.xz |
Merge tag 'v3.7-rc4' into upstream-master
Linux 3.7-rc4
Diffstat (limited to 'arch/arm/mm/vmregion.h')
-rw-r--r-- | arch/arm/mm/vmregion.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mm/vmregion.h b/arch/arm/mm/vmregion.h index bf312c354a21..0f5a5f2a2c7b 100644 --- a/arch/arm/mm/vmregion.h +++ b/arch/arm/mm/vmregion.h @@ -17,7 +17,6 @@ struct arm_vmregion { struct list_head vm_list; unsigned long vm_start; unsigned long vm_end; - void *priv; int vm_active; const void *caller; }; |