From bb32bf132b175937fc967bf69fdda79ffff10088 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Fri, 26 Oct 2007 22:53:58 -0700
Subject: [PATCH] --- yaml --- r: 72639 b: refs/heads/master c:
 72998d8c84247817c4b8b05b0256f29453e435f5 h: refs/heads/master i:   72637:
 547eec8eab1f0e659ee9571fa1bef95c7988ffd4   72635:
 0fdb4cd2038febe3811f4d51d03b3e1aee4cf0b3   72631:
 3ba2a5edf2a076eee5059d85033fbc80d91f5a92   72623:
 44429097b242659caeb0c505ce0b03fbd3880988   72607:
 79597375935523268e7dc2d04a161de9bdaf9887   72575:
 2fc1927f5437e162942886a54400af42a2de8f57 v: v3

---
 [refs]                | 2 +-
 trunk/net/ipv4/esp4.c | 2 +-
 trunk/net/ipv6/esp6.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dd1f2d4ad873..488e205e3015 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18134bed02e230a7876570072b0284635daaa32b
+refs/heads/master: 72998d8c84247817c4b8b05b0256f29453e435f5
diff --git a/trunk/net/ipv4/esp4.c b/trunk/net/ipv4/esp4.c
index ba9840195cf2..23b647c668f1 100644
--- a/trunk/net/ipv4/esp4.c
+++ b/trunk/net/ipv4/esp4.c
@@ -3,7 +3,7 @@
 #include <net/ip.h>
 #include <net/xfrm.h>
 #include <net/esp.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
 #include <linux/crypto.h>
 #include <linux/kernel.h>
 #include <linux/pfkeyv2.h>
diff --git a/trunk/net/ipv6/esp6.c b/trunk/net/ipv6/esp6.c
index f67d51a4e56d..f8bb136d3711 100644
--- a/trunk/net/ipv6/esp6.c
+++ b/trunk/net/ipv6/esp6.c
@@ -29,7 +29,7 @@
 #include <net/ip.h>
 #include <net/xfrm.h>
 #include <net/esp.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
 #include <linux/crypto.h>
 #include <linux/kernel.h>
 #include <linux/pfkeyv2.h>