Merge branch 'for-linus' of git://neil.brown.name/md

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / dvb-usb / dibusb.h

diff --git a/drivers/media/dvb/dvb-usb/dibusb.h b/drivers/media/dvb/dvb-usb/dibusb.h
index 5153fb943da1fce0e429648acb495d644e2cba7c..8e847aa73ba1af1e8db007c5f85d10abbf8a79a0 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dibusb.h
+++ b/drivers/media/dvb/dvb-usb/dibusb.h
@@ -99,7 +99,10 @@
 struct dibusb_state {
        struct dib_fe_xfer_ops ops;
        int mt2060_present;
+       u8 tuner_addr;
+};
 
+struct dibusb_device_state {
        /* for RC5 remote control */
        int old_toggle;
        int last_repeat_count;