Merge tag 'upstream-3.13-rc1' of git://git.infradead.org/linux-ubi

[~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..729b3540c2f9b4fe28ffb97f59daccd910e3ea6d 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
@@ -97,6 +97,12 @@ struct rtl28xxu_reg_val {
        u8 val;
 };
 
+struct rtl28xxu_reg_val_mask {
+       u16 reg;
+       u8 val;
+       u8 mask;
+};
+
 /*
  * memory map
  *