diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 11:12:37 +0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 11:12:37 +0400 |
| commit | 8725f25acc656c1522d48a6746055099efdaca4c (patch) | |
| tree | e241424fa58178ed6c2a95a4eb931ea83dbea33c /drivers/net/irda/via-ircc.h | |
| parent | c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
| download | linux-8725f25acc656c1522d48a6746055099efdaca4c.tar.xz | |
Merge commit 'origin/master'
Manually fixed up:
drivers/net/fs_enet/fs_enet-main.c
Diffstat (limited to 'drivers/net/irda/via-ircc.h')
| -rw-r--r-- | drivers/net/irda/via-ircc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/irda/via-ircc.h b/drivers/net/irda/via-ircc.h index 9d012f0dbd30..403c3f77634c 100644 --- a/drivers/net/irda/via-ircc.h +++ b/drivers/net/irda/via-ircc.h @@ -118,7 +118,6 @@ struct via_ircc_cb { int index; /* Instance index */ struct eventflag EventFlag; - struct pm_dev *dev; unsigned int chip_id; /* to remember chip id */ unsigned int RetryCount; unsigned int RxDataReady; |