diff options
author | Tony Lindgren <tony@atomide.com> | 2012-11-10 02:58:01 +0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-11-10 02:58:01 +0400 |
commit | edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a (patch) | |
tree | 61425adc8b2059a9c12a3ce66ba7361fea1b0bb3 /arch/arm/mm/vmregion.h | |
parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
parent | 3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff) | |
download | linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.tar.xz |
Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3
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; }; |