Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ff5ce7f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb 

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (7798): tuners/Kconfig: Change config name and help to reflect dynamic load for tuners
  V4L/DVB (7794): cx88: Fix a warning
  V4L/DVB (7792): ivtv: correct misspelled "HIMEM4G" to "HIGHMEM4G" in error message
  V4L/DVB (7791): ivtv: POLLHUP must be returned on eof
  V4L/DVB (7789b): Fix merge conflicts
parents c4755d16 ba7cc365

drivers/media/common/tuners/Kconfig

+7 −2
Original line number Diff line number Diff line 
config MEDIA_ATTACH

	bool "Load and attach frontend driver modules as needed"

	bool "Load and attach frontend and tuner driver modules as needed"

	depends on DVB_CORE

	depends on MODULES

	help

	  Remove the static dependency of DVB card drivers on all

	  frontend modules for all possible card variants. Instead,

	  allow the card drivers to only load the frontend modules

	  they require. This saves several KBytes of memory.

	  they require.



	  Also, tuner module will automatically load a tuner driver

	  when needed, for analog mode.



	  This saves several KBytes of memory.



	  Note: You will need module-init-tools v3.2 or later for this feature.

drivers/media/video/cx18/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ config VIDEO_CX18 
	select I2C_ALGOBIT

	select FW_LOADER

	select VIDEO_IR

	select VIDEO_TUNER

	select MEDIA_TUNER

	select VIDEO_TVEEPROM

	select VIDEO_CX2341X

	select VIDEO_CS5345

drivers/media/video/cx18/cx18-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static void cx18_load_and_init_modules(struct cx18 *cx) 
	int i;



	/* load modules */

#ifndef CONFIG_VIDEO_TUNER

#ifndef CONFIG_MEDIA_TUNER

	hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER);

#endif

#ifndef CONFIG_VIDEO_CS5345

drivers/media/video/cx88/cx88-i2c.c

+0 −1
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ static int cx8800_bit_getsda(void *data) 


static int attach_inform(struct i2c_client *client)

{

	struct tuner_setup tun_setup;

	struct cx88_core *core = i2c_get_adapdata(client->adapter);



	dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n",

drivers/media/video/ivtv/ivtv-driver.c

+3 −3
Original line number Diff line number Diff line
@@ -1049,7 +1049,7 @@ static int __devinit ivtv_probe(struct pci_dev *dev, 
				       IVTV_ENCODER_SIZE);

	if (!itv->enc_mem) {

		IVTV_ERR("ioremap failed, perhaps increasing __VMALLOC_RESERVE in page.h\n");

		IVTV_ERR("or disabling CONFIG_HIMEM4G into the kernel would help\n");

		IVTV_ERR("or disabling CONFIG_HIGHMEM4G into the kernel would help\n");

		retval = -ENOMEM;

		goto free_mem;

	}
@@ -1061,7 +1061,7 @@ static int __devinit ivtv_probe(struct pci_dev *dev, 
				IVTV_DECODER_SIZE);

		if (!itv->dec_mem) {

			IVTV_ERR("ioremap failed, perhaps increasing __VMALLOC_RESERVE in page.h\n");

			IVTV_ERR("or disabling CONFIG_HIMEM4G into the kernel would help\n");

			IVTV_ERR("or disabling CONFIG_HIGHMEM4G into the kernel would help\n");

			retval = -ENOMEM;

			goto free_mem;

		}
@@ -1077,7 +1077,7 @@ static int __devinit ivtv_probe(struct pci_dev *dev, 
	    ioremap_nocache(itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);

	if (!itv->reg_mem) {

		IVTV_ERR("ioremap failed, perhaps increasing __VMALLOC_RESERVE in page.h\n");

		IVTV_ERR("or disabling CONFIG_HIMEM4G into the kernel would help\n");

		IVTV_ERR("or disabling CONFIG_HIGHMEM4G into the kernel would help\n");

		retval = -ENOMEM;

		goto free_io;

	}