summaryrefslogtreecommitdiffstats
path: root/include/asm-ia64/sn/tiocx.h
diff options
context:
space:
mode:
authorBruce Losure <blosure@americas.sgi.com>2005-09-02 15:16:35 -0500
committerTony Luck <tony.luck@intel.com>2005-09-06 14:16:01 -0700
commit25732ad493b22b7d9f0d250c5a9ad17219f96a47 (patch)
tree6d2c753c248977fdca4b5d423b65d7fbf2f70186 /include/asm-ia64/sn/tiocx.h
parent4706df3d3c42af802597d82c8b1542c3d52eab23 (diff)
downloadop-kernel-dev-25732ad493b22b7d9f0d250c5a9ad17219f96a47.zip
op-kernel-dev-25732ad493b22b7d9f0d250c5a9ad17219f96a47.tar.gz
[IA64] Altix patch for fpga reset
1) workaround a h/w reset issue 2) to improve the determination of FPGA-based h/w in the arch/ia64/sn/kernel/tiocx code. Signed-off-by: Bruce Losure <blosure@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/asm-ia64/sn/tiocx.h')
-rw-r--r--include/asm-ia64/sn/tiocx.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-ia64/sn/tiocx.h b/include/asm-ia64/sn/tiocx.h
index c5447a5..5699e75 100644
--- a/include/asm-ia64/sn/tiocx.h
+++ b/include/asm-ia64/sn/tiocx.h
@@ -19,6 +19,7 @@ struct cx_id_s {
struct cx_dev {
struct cx_id_s cx_id;
+ int bt; /* board/blade type */
void *soft; /* driver specific */
struct hubdev_info *hubdev;
struct device dev;
@@ -59,7 +60,7 @@ struct cx_drv {
extern struct sn_irq_info *tiocx_irq_alloc(nasid_t, int, int, nasid_t, int);
extern void tiocx_irq_free(struct sn_irq_info *);
extern int cx_device_unregister(struct cx_dev *);
-extern int cx_device_register(nasid_t, int, int, struct hubdev_info *);
+extern int cx_device_register(nasid_t, int, int, struct hubdev_info *, int);
extern int cx_driver_unregister(struct cx_drv *);
extern int cx_driver_register(struct cx_drv *);
extern uint64_t tiocx_dma_addr(uint64_t addr);
OpenPOWER on IntegriCloud