diff options
| author | David Vrabel | 2014-08-11 12:28:08 +0200 |
|---|---|---|
| committer | David Vrabel | 2014-08-11 12:59:14 +0200 |
| commit | ac80c770032c04d37d3f3f74249df66c7329cf38 (patch) | |
| tree | 32f7f2fa7cedb0a9950a646d4a22b96ea5982ac0 /arch/arm/xen | |
| parent | Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | kernel-qcow2-linux-ac80c770032c04d37d3f3f74249df66c7329cf38.tar.gz kernel-qcow2-linux-ac80c770032c04d37d3f3f74249df66c7329cf38.tar.xz kernel-qcow2-linux-ac80c770032c04d37d3f3f74249df66c7329cf38.zip | |
arm/xen: remove duplicate arch_gnttab_init() function
This was introduced in commit e306e3be1cbe (Merge tag
'stable/for-linus-3.17-rc0-tag').
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'arch/arm/xen')
| -rw-r--r-- | arch/arm/xen/grant-table.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/xen/grant-table.c b/arch/arm/xen/grant-table.c index 2c4041c9bac5..e43791829ace 100644 --- a/arch/arm/xen/grant-table.c +++ b/arch/arm/xen/grant-table.c @@ -49,8 +49,3 @@ int arch_gnttab_init(unsigned long nr_shared) { return 0; } - -int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status) -{ - return 0; -} |