diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /include/net/irda | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'include/net/irda')
| -rw-r--r-- | include/net/irda/nsc-ircc.h | 3 | ||||
| -rw-r--r-- | include/net/irda/smc-ircc.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/net/irda/nsc-ircc.h b/include/net/irda/nsc-ircc.h index 75e5c2bc7..637458dd1 100644 --- a/include/net/irda/nsc-ircc.h +++ b/include/net/irda/nsc-ircc.h @@ -31,6 +31,7 @@ #include <linux/time.h> #include <linux/spinlock.h> +#include <linux/pm.h> #include <asm/io.h> /* DMA modes needed */ @@ -253,6 +254,8 @@ struct nsc_ircc_cb { __u32 flags; /* Interface flags */ __u32 new_speed; int index; /* Instance index */ + + struct pm_dev *dev; }; static inline void switch_bank(int iobase, int bank) diff --git a/include/net/irda/smc-ircc.h b/include/net/irda/smc-ircc.h index cac7644ca..0bd5e38b4 100644 --- a/include/net/irda/smc-ircc.h +++ b/include/net/irda/smc-ircc.h @@ -31,6 +31,7 @@ #define SMC_IRCC_H #include <linux/spinlock.h> +#include <linux/pm.h> #include <net/irda/irport.h> @@ -181,6 +182,8 @@ struct ircc_cb { int tx_buff_offsets[10]; /* Offsets between frames in tx_buff */ int tx_len; /* Number of frames in tx_buff */ + + struct pm_dev *pmdev; }; #endif /* SMC_IRCC_H */ |