[Xen-changelog] [xen-unstable] Fix -xen build.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1172854644 0
# Node ID 87087954247ac63165482c1e59fd3b1ea23fd22f
# Parent  4d447158e1dd2fb6de9d817eb3c83b7ef4755932
Fix -xen build.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -r 4d447158e1dd -r 87087954247a 
linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c
--- a/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c   Fri Mar 02 16:29:48 
2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c   Fri Mar 02 16:57:24 
2007 +0000
@@ -437,7 +437,7 @@ static int tpmfront_suspend(struct xenbu
        return 0;
 }
 
-static int tpmfront_resume(struct tpm_private *tp)
+static int tpmfront_suspend_finish(struct tpm_private *tp)
 {
        tp->is_suspended = 0;
        /* Allow applications to send again. */
@@ -448,7 +448,7 @@ static int tpmfront_suspend_cancel(struc
 static int tpmfront_suspend_cancel(struct xenbus_device *dev)
 {
        struct tpm_private *tp = tpm_private_from_dev(&dev->dev);
-       return tpmfront_resume(tp);
+       return tpmfront_suspend_finish(tp);
 }
 
 static int tpmfront_resume(struct xenbus_device *dev)
@@ -691,7 +691,7 @@ static void tpmif_set_connected_state(st
         * This also removes the suspend state.
         */
        if (is_connected == 1 && tp->is_suspended == 1)
-               tpmfront_resume(tp);
+               tpmfront_suspend_finish(tp);
 
        if (is_connected != tp->is_connected) {
                tp->is_connected = is_connected;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog