Merge branch 'patchwork' into topic/docs-next

[cascardo/linux.git] / drivers / media / dvb-core / demux.h

diff --git a/drivers/media/dvb-core/demux.h b/drivers/media/dvb-core/demux.h
index ad42252..99379c0 100644 (file)
--- a/drivers/media/dvb-core/demux.h
+++ b/drivers/media/dvb-core/demux.h
@@ -104,7 +104,7 @@ struct dmx_ts_feed {
                   int type,
                   enum dmx_ts_pes pes_type,
                   size_t circular_buffer_size,
-                  struct timespec timeout);
+                  ktime_t timeout);
        int (*start_filtering)(struct dmx_ts_feed *feed);
        int (*stop_filtering)(struct dmx_ts_feed *feed);
 };