merge xhfc with xilun's changes

1 files changed, 1 insertions, 8 deletions

diff --git a/xhfc/xhfc.h b/xhfc/xhfc.h
index 6b465f1..d20cb46 100644
--- a/xhfc/xhfc.h
+++ b/xhfc/xhfc.h
@@ -126,18 +126,15 @@ struct xhfc_span {
 	/* Same as in DAHDI's for sameness reasons XXX which are??? */
 
 	struct dahdi_span span;
+	struct dahdi_chan* sigchan;
 	atomic_t hdlc_pending; /* read and dec'd in interrupt context 
 				* inc'd in xhfc_hdlc_hard_xmit called by DAHDI
 				* in user context */
 
 	int port;	/* (physical) S/T port number */
 	int nt;		/* 1 if the port is nt, 0 if it's TE	*/
-	
 
-	/* Got the following from DAHDI */
 	u8 state, prev_state;
-
-	struct dahdi_chan* sigchan;
 	unsigned long activation_timer, f6_f7_transition; // timers; 0 when deactivated
 };
 
@@ -186,10 +183,6 @@ void deactivate_request(struct xhfc_span* s);
 void handle_state_change(struct xhfc_span* s);
 void handle_st_timers(struct xhfc_span* s);
 
-int __devinit xhfc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
-void __devexit xhfc_remove_one(struct pci_dev *pdev);
-void xhfc_shutdown(struct pci_dev *pdev);
-
 extern uint debug;
 extern uint dbg_spanfilter;