From 0ce2172661dd3621c2ce517a619c10fb942bb3df Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Thu, 17 Nov 2005 14:11:18 -0800
Subject: [PATCH] --- yaml --- r: 14372 b: refs/heads/master c:
 bd6af700a7191f483f41706467033588f28c8877 h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/arch/ppc/platforms/85xx/mpc85xx_ads_common.h | 2 --
 trunk/arch/ppc/platforms/85xx/stx_gp3.h            | 2 ++
 trunk/net/ipv4/tcp_highspeed.c                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 680e8c0ba32e..c110a1fb6975 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 976164497d6d8050403c96894ad418de44ec748f
+refs/heads/master: bd6af700a7191f483f41706467033588f28c8877
diff --git a/trunk/arch/ppc/platforms/85xx/mpc85xx_ads_common.h b/trunk/arch/ppc/platforms/85xx/mpc85xx_ads_common.h
index 198a6a02cde8..7b26bcc5d10d 100644
--- a/trunk/arch/ppc/platforms/85xx/mpc85xx_ads_common.h
+++ b/trunk/arch/ppc/platforms/85xx/mpc85xx_ads_common.h
@@ -25,8 +25,6 @@
 #define BCSR_ADDR		((uint)0xf8000000)
 #define BCSR_SIZE		((uint)(32 * 1024))
 
-struct seq_file;
-
 extern int mpc85xx_ads_show_cpuinfo(struct seq_file *m);
 extern void mpc85xx_ads_init_IRQ(void) __init;
 extern void mpc85xx_ads_map_io(void) __init;
diff --git a/trunk/arch/ppc/platforms/85xx/stx_gp3.h b/trunk/arch/ppc/platforms/85xx/stx_gp3.h
index 2f25b5195152..7bcc6c35a417 100644
--- a/trunk/arch/ppc/platforms/85xx/stx_gp3.h
+++ b/trunk/arch/ppc/platforms/85xx/stx_gp3.h
@@ -21,6 +21,7 @@
 
 #include <linux/config.h>
 #include <linux/init.h>
+#include <linux/seq_file.h>
 #include <asm/ppcboot.h>
 
 #define BOARD_CCSRBAR		((uint)0xe0000000)
@@ -42,6 +43,7 @@ extern void mpc85xx_setup_hose(void) __init;
 extern void mpc85xx_restart(char *cmd);
 extern void mpc85xx_power_off(void);
 extern void mpc85xx_halt(void);
+extern int mpc85xx_show_cpuinfo(struct seq_file *m);
 extern void mpc85xx_init_IRQ(void) __init;
 extern unsigned long mpc85xx_find_end_of_memory(void) __init;
 extern void mpc85xx_calibrate_decr(void) __init;
diff --git a/trunk/net/ipv4/tcp_highspeed.c b/trunk/net/ipv4/tcp_highspeed.c
index 82b3c189bd7d..63cf7e540847 100644
--- a/trunk/net/ipv4/tcp_highspeed.c
+++ b/trunk/net/ipv4/tcp_highspeed.c
@@ -111,7 +111,7 @@ static void hstcp_init(struct sock *sk)
 }
 
 static void hstcp_cong_avoid(struct sock *sk, u32 adk, u32 rtt,
-			     u32 in_flight, u32 pkts_acked)
+			     u32 in_flight, int data_acked)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
 	struct hstcp *ca = inet_csk_ca(sk);