From 20d21c1cc688c5cbd11189945642ce5f6849cffd Mon Sep 17 00:00:00 2001
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Thu, 3 Jan 2008 20:43:21 -0800
Subject: [PATCH] --- yaml --- r: 75261 b: refs/heads/master c:
 2d60abc2a937bf77575c3b8c83faeeb84a84e654 h: refs/heads/master i:   75259:
 618e213f25b9830a1aa6b253072a0413cc4e5a14 v: v3

---
 [refs]                      | 2 +-
 trunk/net/xfrm/xfrm_state.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 12fa1a4a33e8..1e280482f6d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76975f8a3186dae501584d0155ea410464f62815
+refs/heads/master: 2d60abc2a937bf77575c3b8c83faeeb84a84e654
diff --git a/trunk/net/xfrm/xfrm_state.c b/trunk/net/xfrm/xfrm_state.c
index ee1e69753932..f26aaaca1fae 100644
--- a/trunk/net/xfrm/xfrm_state.c
+++ b/trunk/net/xfrm/xfrm_state.c
@@ -1749,6 +1749,7 @@ void km_policy_expired(struct xfrm_policy *pol, int dir, int hard, u32 pid)
 }
 EXPORT_SYMBOL(km_policy_expired);
 
+#ifdef CONFIG_XFRM_MIGRATE
 int km_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
 	       struct xfrm_migrate *m, int num_migrate)
 {
@@ -1768,6 +1769,7 @@ int km_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
 	return err;
 }
 EXPORT_SYMBOL(km_migrate);
+#endif
 
 int km_report(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr)
 {