diff options
| author | Bruce Losure <blosure@americas.sgi.com> | 2005-09-02 22:16:35 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-09-06 23:16:01 +0200 |
| commit | 25732ad493b22b7d9f0d250c5a9ad17219f96a47 (patch) | |
| tree | 6d2c753c248977fdca4b5d423b65d7fbf2f70186 /include/asm-ia64/sn/tiocx.h | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6 (diff) | |
| download | linux-25732ad493b22b7d9f0d250c5a9ad17219f96a47.tar.xz linux-25732ad493b22b7d9f0d250c5a9ad17219f96a47.zip | |
[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.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-ia64/sn/tiocx.h b/include/asm-ia64/sn/tiocx.h index c5447a504509..5699e75e5024 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); |