diff options
author | Tony Lindgren <tony@atomide.com> | 2013-04-01 11:55:04 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-04-01 11:55:04 -0400 |
commit | d29778a01d5fc4b69ca1e7bc21121536e5c1c31d (patch) | |
tree | 0fb90068b5b19436723d55bc44350776588c2992 /drivers/xen/fallback.c | |
parent | ce9df0b00ac7f0a733d361c23bebdd79f32f8adc (diff) | |
parent | 469d633d20c774ecd34ac615c838193e1e150c62 (diff) |
Merge tag 'omap-devel-b-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.10/fixes-non-critical
Some miscellaneous OMAP hwmod, powerdomain, and clock fixes for 3.10.
Basic test logs are here:
http://www.pwsan.com/omap/testlogs/prcm_fixes_a_3.10/20130331205716/
Diffstat (limited to 'drivers/xen/fallback.c')
-rw-r--r-- | drivers/xen/fallback.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/xen/fallback.c b/drivers/xen/fallback.c index 0ef7c4d40f86..b04fb64c5a91 100644 --- a/drivers/xen/fallback.c +++ b/drivers/xen/fallback.c | |||
@@ -44,7 +44,7 @@ int xen_event_channel_op_compat(int cmd, void *arg) | |||
44 | } | 44 | } |
45 | EXPORT_SYMBOL_GPL(xen_event_channel_op_compat); | 45 | EXPORT_SYMBOL_GPL(xen_event_channel_op_compat); |
46 | 46 | ||
47 | int HYPERVISOR_physdev_op_compat(int cmd, void *arg) | 47 | int xen_physdev_op_compat(int cmd, void *arg) |
48 | { | 48 | { |
49 | struct physdev_op op; | 49 | struct physdev_op op; |
50 | int rc; | 50 | int rc; |
@@ -78,3 +78,4 @@ int HYPERVISOR_physdev_op_compat(int cmd, void *arg) | |||
78 | 78 | ||
79 | return rc; | 79 | return rc; |
80 | } | 80 | } |
81 | EXPORT_SYMBOL_GPL(xen_physdev_op_compat); | ||