projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
xen
/
grant-table.c
diff --git
a/arch/arm/xen/grant-table.c
b/arch/arm/xen/grant-table.c
index 2c4041c9bac5e18e320d25b0577d034c52514b43..e43791829aceb2a725d45b419b36c21b54ec0300 100644
(file)
--- 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;
-}