diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-08-04 14:43:45 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-04 14:43:45 +0300 |
| commit | 7590d1defdc720a97a9e186f45f529c4ae1b40f7 (patch) | |
| tree | e7ffdc043a2847f410d654d8e99e001f3138937a /arch/arm/mm/vmregion.h | |
| parent | 7e788b4289bb025a96e327c604cb2db92e17108f (diff) | |
| parent | 869fef41547db95df8523bf67845a21313709428 (diff) | |
| download | op-kernel-dev-7590d1defdc720a97a9e186f45f529c4ae1b40f7.zip op-kernel-dev-7590d1defdc720a97a9e186f45f529c4ae1b40f7.tar.gz | |
Merge branch 'devel-map-io' into omap-for-linus
Diffstat (limited to 'arch/arm/mm/vmregion.h')
| -rw-r--r-- | arch/arm/mm/vmregion.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/vmregion.h b/arch/arm/mm/vmregion.h index 6b2cdbd..15e9f04 100644 --- a/arch/arm/mm/vmregion.h +++ b/arch/arm/mm/vmregion.h @@ -21,7 +21,7 @@ struct arm_vmregion { int vm_active; }; -struct arm_vmregion *arm_vmregion_alloc(struct arm_vmregion_head *, size_t, gfp_t); +struct arm_vmregion *arm_vmregion_alloc(struct arm_vmregion_head *, size_t, size_t, gfp_t); struct arm_vmregion *arm_vmregion_find(struct arm_vmregion_head *, unsigned long); struct arm_vmregion *arm_vmregion_find_remove(struct arm_vmregion_head *, unsigned long); void arm_vmregion_free(struct arm_vmregion_head *, struct arm_vmregion *); |
