Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[~andy/linux] / drivers / media / usb / dvb-usb-v2 / rtl28xxu.h

diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.h b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
index 533a33127289d959f52e407b43ebc1c224f53877..2142bcb41b414b42a45774babef70529c3658d97 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
@@ -83,6 +83,7 @@ enum rtl28xxu_tuner {
        TUNER_RTL2832_TDA18272,
        TUNER_RTL2832_FC0013,
        TUNER_RTL2832_R820T,
+       TUNER_RTL2832_R828D,
 };
 
 struct rtl28xxu_req {
@@ -97,6 +98,12 @@ struct rtl28xxu_reg_val {
        u8 val;
 };
 
+struct rtl28xxu_reg_val_mask {
+       u16 reg;
+       u8 val;
+       u8 mask;
+};
+
 /*
  * memory map
  *