UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] em28xx: Allow to compile it without RC/input support 

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2011-06-18 10:19:11 -03:00
parent 0f8a61fc42
commit 5b89ecf989
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/video/em28xx/Kconfig
View File

@ -3,7 +3,6 @@ config VIDEO_EM28XX
depends on VIDEO_DEV && I2C depends on VIDEO_DEV && I2C
select VIDEO_TUNER select VIDEO_TUNER
select VIDEO_TVEEPROM select VIDEO_TVEEPROM
depends on RC_CORE
select VIDEOBUF_VMALLOC select VIDEOBUF_VMALLOC
select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
select VIDEO_TVP5150 if VIDEO_HELPER_CHIPS_AUTO select VIDEO_TVP5150 if VIDEO_HELPER_CHIPS_AUTO
@ -44,3 +43,12 @@ config VIDEO_EM28XX_DVB
---help--- ---help---
This adds support for DVB cards based on the This adds support for DVB cards based on the
Empiatech em28xx chips. Empiatech em28xx chips.
config VIDEO_EM28XX_RC
bool "EM28XX Remote Controller support"
depends on RC_CORE
depends on VIDEO_EM28XX
depends on !(RC_CORE=m && VIDEO_EM28XX=y)
default y
---help---
Enables Remote Controller support on em28xx driver.

6
drivers/media/video/em28xx/Makefile
View File

@ -1,5 +1,7 @@
em28xx-objs := em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \ em28xx-y := em28xx-video.o em28xx-i2c.o em28xx-cards.o
em28xx-input.o em28xx-vbi.o em28xx-y += em28xx-core.o em28xx-vbi.o
em28xx-$(CONFIG_VIDEO_EM28XX_RC) += em28xx-input.o
em28xx-alsa-objs := em28xx-audio.o em28xx-alsa-objs := em28xx-audio.o

17
drivers/media/video/em28xx/em28xx.h
View File

@ -697,6 +697,9 @@ int em28xx_tuner_callback(void *ptr, int component, int command, int arg);
void em28xx_release_resources(struct em28xx *dev); void em28xx_release_resources(struct em28xx *dev);
/* Provided by em28xx-input.c */ /* Provided by em28xx-input.c */
#ifdef CONFIG_VIDEO_EM28XX_RC
int em28xx_get_key_terratec(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw); int em28xx_get_key_terratec(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw);
int em28xx_get_key_em_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw); int em28xx_get_key_em_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw);
int em28xx_get_key_pinnacle_usb_grey(struct IR_i2c *ir, u32 *ir_key, int em28xx_get_key_pinnacle_usb_grey(struct IR_i2c *ir, u32 *ir_key,
@ -709,6 +712,20 @@ void em28xx_deregister_snapshot_button(struct em28xx *dev);
int em28xx_ir_init(struct em28xx *dev); int em28xx_ir_init(struct em28xx *dev);
int em28xx_ir_fini(struct em28xx *dev); int em28xx_ir_fini(struct em28xx *dev);
#else
#define em28xx_get_key_terratec NULL
#define em28xx_get_key_em_haup NULL
#define em28xx_get_key_pinnacle_usb_grey NULL
#define em28xx_get_key_winfast_usbii_deluxe NULL
static inline void em28xx_register_snapshot_button(struct em28xx *dev) {}
static inline void em28xx_deregister_snapshot_button(struct em28xx *dev) {}
static inline int em28xx_ir_init(struct em28xx *dev) { return 0; }
static inline int em28xx_ir_fini(struct em28xx *dev) { return 0; }
#endif
/* Provided by em28xx-vbi.c */ /* Provided by em28xx-vbi.c */
extern struct videobuf_queue_ops em28xx_vbi_qops; extern struct videobuf_queue_ops em28xx_vbi_qops;