diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 17:12:37 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 17:12:37 +1000 |
| commit | 8725f25acc656c1522d48a6746055099efdaca4c (patch) | |
| tree | e241424fa58178ed6c2a95a4eb931ea83dbea33c /drivers/net/irda/ali-ircc.h | |
| parent | c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
Merge commit 'origin/master'
Manually fixed up:
drivers/net/fs_enet/fs_enet-main.c
Diffstat (limited to 'drivers/net/irda/ali-ircc.h')
| -rw-r--r-- | drivers/net/irda/ali-ircc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/irda/ali-ircc.h b/drivers/net/irda/ali-ircc.h index 07876578887f..ed35d99763d5 100644 --- a/drivers/net/irda/ali-ircc.h +++ b/drivers/net/irda/ali-ircc.h @@ -219,8 +219,6 @@ struct ali_ircc_cb { int index; /* Instance index */ unsigned char fifo_opti_buf; - - struct pm_dev *dev; }; static inline void switch_bank(int iobase, int bank) |