From e2f4b7c28e1a99b1beaf3cc333691f5427c6cbf4 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@mandriva.com>
Date: Sat, 27 Aug 2005 23:18:26 -0300
Subject: [PATCH] --- yaml --- r: 6437 b: refs/heads/master c:
 4524b259541e1eea07020af825d8e7b0e4faaec5 h: refs/heads/master i:   6435:
 54b75b3b7f69ba5feced40935744ab9a1892f895 v: v3

---
 [refs]                                          | 2 +-
 trunk/net/dccp/Makefile                         | 2 +-
 trunk/net/dccp/ccids/Makefile                   | 2 +-
 trunk/net/dccp/ccids/ccid3.c                    | 2 +-
 trunk/net/dccp/{ => ccids/lib}/packet_history.c | 0
 trunk/net/dccp/{ => ccids/lib}/packet_history.h | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename trunk/net/dccp/{ => ccids/lib}/packet_history.c (100%)
 rename trunk/net/dccp/{ => ccids/lib}/packet_history.h (99%)

diff --git a/[refs] b/[refs]
index 78629129aea9..7c3daec13778 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae6706f0678b89de07ad3b456893cc883584f711
+refs/heads/master: 4524b259541e1eea07020af825d8e7b0e4faaec5
diff --git a/trunk/net/dccp/Makefile b/trunk/net/dccp/Makefile
index 44a867f29184..fb97bb042455 100644
--- a/trunk/net/dccp/Makefile
+++ b/trunk/net/dccp/Makefile
@@ -1,7 +1,7 @@
 obj-$(CONFIG_IP_DCCP) += dccp.o
 
 dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o \
-	  timer.o packet_history.o
+	  timer.o
 
 obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o
 
diff --git a/trunk/net/dccp/ccids/Makefile b/trunk/net/dccp/ccids/Makefile
index 323b68f3b607..29eb1b61fdbd 100644
--- a/trunk/net/dccp/ccids/Makefile
+++ b/trunk/net/dccp/ccids/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_IP_DCCP_CCID3) += dccp_ccid3.o
 
-dccp_ccid3-y := ccid3.o lib/loss_interval.o
+dccp_ccid3-y := ccid3.o lib/loss_interval.o lib/packet_history.o
diff --git a/trunk/net/dccp/ccids/ccid3.c b/trunk/net/dccp/ccids/ccid3.c
index 7468928b83c6..12548fbde86b 100644
--- a/trunk/net/dccp/ccids/ccid3.c
+++ b/trunk/net/dccp/ccids/ccid3.c
@@ -37,7 +37,7 @@
 #include <linux/config.h>
 #include "../ccid.h"
 #include "../dccp.h"
-#include "../packet_history.h"
+#include "lib/packet_history.h"
 #include "lib/loss_interval.h"
 #include "ccid3.h"
 
diff --git a/trunk/net/dccp/packet_history.c b/trunk/net/dccp/ccids/lib/packet_history.c
similarity index 100%
rename from trunk/net/dccp/packet_history.c
rename to trunk/net/dccp/ccids/lib/packet_history.c
diff --git a/trunk/net/dccp/packet_history.h b/trunk/net/dccp/ccids/lib/packet_history.h
similarity index 99%
rename from trunk/net/dccp/packet_history.h
rename to trunk/net/dccp/ccids/lib/packet_history.h
index 2e5ba343e3dd..235828d822d9 100644
--- a/trunk/net/dccp/packet_history.h
+++ b/trunk/net/dccp/ccids/lib/packet_history.h
@@ -42,7 +42,7 @@
 #include <linux/slab.h>
 #include <linux/time.h>
 
-#include "dccp.h"
+#include "../../dccp.h"
 
 struct dccp_tx_hist_entry {
 	struct list_head dccphtx_node;