From 8f90c7b3b3370b865183320a66fc87439945af9e Mon Sep 17 00:00:00 2001
From: Peter Chubb <peterc@gelato.unsw.edu.au>
Date: Tue, 21 Aug 2007 13:57:01 +1000
Subject: [PATCH] --- yaml --- r: 64695 b: refs/heads/master c:
 7b3166dbc3df5b72f2ba4ea130f4461e318a3838 h: refs/heads/master i:   64693:
 60b2103718cc88ca3e5e139c808b41c7f4ded229   64691:
 a2aab4792490ca2a33161bd3dd2308c00b6886f0   64687:
 01668980be8d9250119cdd0af1275f02f06f7690 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/ia64/hp/sim/hpsim_console.c |  1 -
 trunk/arch/ia64/hp/sim/simeth.c        | 12 +++---------
 trunk/arch/ia64/hp/sim/simscsi.c       |  3 +--
 trunk/include/asm-ia64/hpsim.h         |  6 ++++++
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index e74f20c0dba1..8f44ae832a3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b713c67bccef7cabb0ee915f47eb33d82636af9
+refs/heads/master: 7b3166dbc3df5b72f2ba4ea130f4461e318a3838
diff --git a/trunk/arch/ia64/hp/sim/hpsim_console.c b/trunk/arch/ia64/hp/sim/hpsim_console.c
index 0475a5452404..01663bc42b1a 100644
--- a/trunk/arch/ia64/hp/sim/hpsim_console.c
+++ b/trunk/arch/ia64/hp/sim/hpsim_console.c
@@ -59,7 +59,6 @@ simcons_write (struct console *cons, const char *buf, unsigned count)
 
 static struct tty_driver *simcons_console_device (struct console *c, int *index)
 {
-	extern struct tty_driver *hp_simserial_driver;
 	*index = c->index;
 	return hp_simserial_driver;
 }
diff --git a/trunk/arch/ia64/hp/sim/simeth.c b/trunk/arch/ia64/hp/sim/simeth.c
index f26077a773d5..4017696ada63 100644
--- a/trunk/arch/ia64/hp/sim/simeth.c
+++ b/trunk/arch/ia64/hp/sim/simeth.c
@@ -22,6 +22,9 @@
 #include <linux/bitops.h>
 #include <asm/system.h>
 #include <asm/irq.h>
+#include <asm/hpsim.h>
+
+#include "hpsim_ssc.h"
 
 #define SIMETH_RECV_MAX	10
 
@@ -35,12 +38,6 @@
 #define SIMETH_FRAME_SIZE	ETH_FRAME_LEN
 
 
-#define SSC_NETDEV_PROBE		100
-#define SSC_NETDEV_SEND			101
-#define SSC_NETDEV_RECV			102
-#define SSC_NETDEV_ATTACH		103
-#define SSC_NETDEV_DETACH		104
-
 #define NETWORK_INTR			8
 
 struct simeth_local {
@@ -124,9 +121,6 @@ simeth_probe (void)
 	return r;
 }
 
-extern long ia64_ssc (long, long, long, long, int);
-extern void ia64_ssc_connect_irq (long intr, long irq);
-
 static inline int
 netdev_probe(char *name, unsigned char *ether)
 {
diff --git a/trunk/arch/ia64/hp/sim/simscsi.c b/trunk/arch/ia64/hp/sim/simscsi.c
index e62694f8ef75..4552a1cf5b33 100644
--- a/trunk/arch/ia64/hp/sim/simscsi.c
+++ b/trunk/arch/ia64/hp/sim/simscsi.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/timer.h>
 #include <asm/irq.h>
+#include "hpsim_ssc.h"
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -59,8 +60,6 @@ struct disk_stat {
 	unsigned count;
 };
 
-extern long ia64_ssc (long arg0, long arg1, long arg2, long arg3, int nr);
-
 static int desc[16] = {
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
 };
diff --git a/trunk/include/asm-ia64/hpsim.h b/trunk/include/asm-ia64/hpsim.h
index d6be3fdc39fa..892ab198a9da 100644
--- a/trunk/include/asm-ia64/hpsim.h
+++ b/trunk/include/asm-ia64/hpsim.h
@@ -7,4 +7,10 @@ static inline int simcons_register(void) { return 1; }
 int simcons_register(void);
 #endif
 
+struct tty_driver;
+extern struct tty_driver *hp_simserial_driver;
+
+void ia64_ssc_connect_irq(long intr, long irq);
+void ia64_ctl_trace(long on);
+
 #endif