Merge remote-tracking branch 'regulator/fix/dbx500' into regulator-linus

[~andy/linux] / drivers / staging / media / as102 / as102_drv.h

diff --git a/drivers/staging/media/as102/as102_drv.h b/drivers/staging/media/as102/as102_drv.h
index 957f0ed0d81aae7c8d587dbca4b853cf862b3814..b0e5a23bd5323569911afc7e904377fae594fb01 100644 (file)
--- a/drivers/staging/media/as102/as102_drv.h
+++ b/drivers/staging/media/as102/as102_drv.h
@@ -76,7 +76,7 @@ struct as102_dev_t {
        struct as10x_bus_adapter_t bus_adap;
        struct list_head device_entry;
        struct kref kref;
-       unsigned long minor;
+       uint8_t elna_cfg;
 
        struct dvb_adapter dvb_adap;
        struct dvb_frontend dvb_fe;