diff options
| author |   Javier Martinez Canillas <javier@osg.samsung.com> | 2016-02-05 17:09:56 -0200 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-02-11 11:10:59 -0200 |
| commit | b802fb99ae964681d1754428f67970911e0476e9 (patch) | |
| tree | b1ae25cb0173e8cbe0812bf7e15015a96fa2375c | |
| parent | [media] tvp5150: add internal signal generator to HW input list (diff) | |
| download | wireguard-linux-b802fb99ae964681d1754428f67970911e0476e9.tar.xz wireguard-linux-b802fb99ae964681d1754428f67970911e0476e9.zip | |
[media] tvp5150: move input definition header to dt-bindings
Add a header file for the tvp5150 input connectors constants that
can be shared between the driver and Device Tree source files.
[mchehab@osg.samsung.com: rename tvp5150.h also at em28xx-cards.c]
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
| -rw-r--r-- | drivers/media/i2c/tvp5150.c | 2 | ||||
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx-cards.c | 2 | ||||
| -rw-r--r-- | include/dt-bindings/media/tvp5150.h (renamed from include/media/i2c/tvp5150.h) | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c index 093ff80f944c..3a32fd1df805 100644 --- a/drivers/media/i2c/tvp5150.c +++ b/drivers/media/i2c/tvp5150.c @@ -5,6 +5,7 @@ * This code is placed under the terms of the GNU General Public License v2 */ +#include <dt-bindings/media/tvp5150.h> #include <linux/i2c.h> #include <linux/slab.h> #include <linux/videodev2.h> @@ -13,7 +14,6 @@ #include <linux/module.h> #include <media/v4l2-async.h> #include <media/v4l2-device.h> -#include <media/i2c/tvp5150.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-of.h> #include <media/v4l2-mc.h> diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c index ba442c967415..06a09b4e4a83 100644 --- a/drivers/media/usb/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c @@ -32,7 +32,7 @@ #include <media/tuner.h> #include <media/drv-intf/msp3400.h> #include <media/i2c/saa7115.h> -#include <media/i2c/tvp5150.h> +#include <dt-bindings/media/tvp5150.h> #include <media/i2c/tvaudio.h> #include <media/i2c-addr.h> #include <media/tveeprom.h> diff --git a/include/media/i2c/tvp5150.h b/include/dt-bindings/media/tvp5150.h index 685a1e718531..dc347569854f 100644 --- a/include/media/i2c/tvp5150.h +++ b/include/dt-bindings/media/tvp5150.h @@ -18,8 +18,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _TVP5150_H_ -#define _TVP5150_H_ +#ifndef _DT_BINDINGS_MEDIA_TVP5150_H +#define _DT_BINDINGS_MEDIA_TVP5150_H /* TVP5150 HW inputs */ #define TVP5150_COMPOSITE0 0 @@ -31,4 +31,4 @@ #define TVP5150_NORMAL 0 #define TVP5150_BLACK_SCREEN 1 -#endif +#endif /* _DT_BINDINGS_MEDIA_TVP5150_H */ |