aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/dvb/dibusb/dvb-dibusb.h
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-05-17 09:10:20 -0700
committerTony Luck <tony.luck@intel.com>2005-05-17 09:10:20 -0700
commitd0dac8082cbc2b234917ec53eb591b1ddbec80bb (patch)
tree105651af2db033de4803b91cc029381a1b9b39d2 /drivers/media/dvb/dibusb/dvb-dibusb.h
parentbfd68594082d8384781c242aa72a7950b5cf51aa (diff)
parentff96b3d4b840e8aa126e0a60fd743417ffdee178 (diff)
Merge with linus
Diffstat (limited to 'drivers/media/dvb/dibusb/dvb-dibusb.h')
-rw-r--r--drivers/media/dvb/dibusb/dvb-dibusb.h2
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 52cd35dd9d8..c965b64fb1a 100644
--- a/drivers/media/dvb/dibusb/dvb-dibusb.h
+++ b/drivers/media/dvb/dibusb/dvb-dibusb.h
@@ -181,7 +181,7 @@ struct usb_dibusb {
struct semaphore i2c_sem;
/* dvb */
- struct dvb_adapter *adapter;
+ struct dvb_adapter adapter;
struct dmxdev dmxdev;
struct dvb_demux demux;
struct dvb_net dvb_net;