diff options
| author | Christoph Hellwig <hch@hera.kernel.org> | 2005-05-27 04:16:24 -0400 |
|---|---|---|
| committer | Christoph Hellwig <hch@melbourne.sgi.com> | 2005-05-27 04:16:24 -0400 |
| commit | b19312c4c8f3f84da57bba01d45549df1cf10dcd (patch) | |
| tree | 1c34ce89be6b4e257bc03026d0268deb17727044 /drivers/media/dvb/dibusb/dvb-dibusb.h | |
| parent | d3870398fafd4911bd84573b78be4b6b762f32b0 (diff) | |
| parent | 4ec5240ec367a592834385893200dd4fb369354c (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/media/dvb/dibusb/dvb-dibusb.h')
| -rw-r--r-- | drivers/media/dvb/dibusb/dvb-dibusb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dibusb/dvb-dibusb.h b/drivers/media/dvb/dibusb/dvb-dibusb.h index 52cd35dd9d83..c965b64fb1ab 100644 --- a/drivers/media/dvb/dibusb/dvb-dibusb.h +++ b/drivers/media/dvb/dibusb/dvb-dibusb.h | |||
| @@ -181,7 +181,7 @@ struct usb_dibusb { | |||
| 181 | struct semaphore i2c_sem; | 181 | struct semaphore i2c_sem; |
| 182 | 182 | ||
| 183 | /* dvb */ | 183 | /* dvb */ |
| 184 | struct dvb_adapter *adapter; | 184 | struct dvb_adapter adapter; |
| 185 | struct dmxdev dmxdev; | 185 | struct dmxdev dmxdev; |
| 186 | struct dvb_demux demux; | 186 | struct dvb_demux demux; |
| 187 | struct dvb_net dvb_net; | 187 | struct dvb_net dvb_net; |