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

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 47b5649729df..ed020f722b05 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -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;
         }