diff --git a/[refs] b/[refs] index b3dd2beb9a4d..09c8d5aac8b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81c684d12ddc05bba4953e36e9cdd5939dde344b +refs/heads/master: 256f3bfce87fe39ec008b2c27890b30066984f50 diff --git a/trunk/drivers/net/irda/ali-ircc.h b/trunk/drivers/net/irda/ali-ircc.h index 07876578887f..ed35d99763d5 100644 --- a/trunk/drivers/net/irda/ali-ircc.h +++ b/trunk/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) diff --git a/trunk/drivers/net/irda/au1000_ircc.h b/trunk/drivers/net/irda/au1000_ircc.h index 7a31d4659ed6..b4763f24dded 100644 --- a/trunk/drivers/net/irda/au1000_ircc.h +++ b/trunk/drivers/net/irda/au1000_ircc.h @@ -122,6 +122,5 @@ struct au1k_private { struct timer_list timer; spinlock_t lock; /* For serializing operations */ - struct pm_dev *dev; }; #endif /* AU1000_IRCC_H */ diff --git a/trunk/drivers/net/irda/via-ircc.h b/trunk/drivers/net/irda/via-ircc.h index 9d012f0dbd30..403c3f77634c 100644 --- a/trunk/drivers/net/irda/via-ircc.h +++ b/trunk/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;