Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

Fix up delete/modify conflict of arch/ppc/kernel/process.c by hand (it's
gone, gone, gone).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 77eadf84cb2c..f0f04be989d6 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -590,9 +590,9 @@ static void veth_handle_event(struct HvLpEvent *event, struct pt_regs *regs)
 {
         struct veth_lpevent *veth_event = (struct veth_lpevent *)event;
 
-        if (event->xFlags.xFunction == HvLpEvent_Function_Ack)
+        if (hvlpevent_is_ack(event))
                 veth_handle_ack(veth_event);
-        else if (event->xFlags.xFunction == HvLpEvent_Function_Int)
+        else
                 veth_handle_int(veth_event);
 }