diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-13 16:25:38 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-13 16:25:38 -0500 |
| commit | 89ab216b33ba9405880fd3d89531305a931bc70f (patch) | |
| tree | 8f6428ce51ecaed6f6e1379c036dbe341eb71e34 /arch/arm/xen/grant-table.c | |
| parent | c9d501e5cb0238910337213e12a09127221c35d8 (diff) | |
| parent | 46bf4a562207c5ebd24e1dde5e5ee326cd3d6b91 (diff) | |
Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock
Diffstat (limited to 'arch/arm/xen/grant-table.c')
| -rw-r--r-- | arch/arm/xen/grant-table.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/xen/grant-table.c b/arch/arm/xen/grant-table.c index dbd1330c0196..859a9bb002d5 100644 --- a/arch/arm/xen/grant-table.c +++ b/arch/arm/xen/grant-table.c | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | #include <xen/page.h> | 33 | #include <xen/page.h> |
| 34 | #include <xen/grant_table.h> | 34 | #include <xen/grant_table.h> |
| 35 | 35 | ||
| 36 | int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes, | 36 | int arch_gnttab_map_shared(xen_pfn_t *frames, unsigned long nr_gframes, |
| 37 | unsigned long max_nr_gframes, | 37 | unsigned long max_nr_gframes, |
| 38 | void **__shared) | 38 | void **__shared) |
| 39 | { | 39 | { |