Merge tag 'v4.0-rc1' into patchwork

[mirror_ubuntu-artful-kernel.git] / include / media / media-entity.h

diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index e00459185d2079161424b069c9e9c6bece2210c5..d6d74bcfe1839e9d89280182164d3e9a9c659ce6 100644 (file)
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -87,17 +87,7 @@ struct media_entity {
                struct {
                        u32 major;
                        u32 minor;
-               } v4l;
-               struct {
-                       u32 major;
-                       u32 minor;
-               } fb;
-               struct {
-                       u32 card;
-                       u32 device;
-                       u32 subdevice;
-               } alsa;
-               int dvb;
+               } dev;
 
                /* Sub-device specifications */
                /* Nothing needed yet */