4 files changed, 10 insertions, 10 deletions

diff --git a/drivers/media/video/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig
index 7f20c166d59f..854cc9c30ca9 100644
--- a/drivers/media/video/ivtv/Kconfig
+++ b/drivers/media/video/ivtv/Kconfig
@@ -41,4 +41,4 @@ config VIDEO_FB_IVTV
           homepage at <http://www.ivtvdriver.org>.
 
           To compile this driver as a module, choose M here: the
-          module will be called ivtv-fb.
+          module will be called ivtvfb.
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 2a5e0facca7d..511a66252413 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -1397,7 +1397,7 @@ static void module_cleanup(void)
         spin_unlock(&ivtv_cards_lock);
 }
 
-/* Note: These symbols are exported because they are used by the ivtv-fb
+/* Note: These symbols are exported because they are used by the ivtvfb
    framebuffer module and an infrared module for the IR-blaster. */
 EXPORT_SYMBOL(ivtv_set_irq_mask);
 EXPORT_SYMBOL(ivtv_cards_active);
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index 5400ccef4dfb..32dfc7a859fa 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -695,7 +695,7 @@ struct ivtv {
         u32 osd_chroma_key;             /* current chroma key */
         struct v4l2_rect osd_rect;      /* current OSD position and size */
         struct v4l2_rect main_rect;     /* current Main window position and size */
-        struct osd_info *osd_info;      /* ivtv-fb private OSD info */
+        struct osd_info *osd_info;      /* ivtvfb private OSD info */
 };
 
 /* Globals */
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c
index ff721c088479..c8ca7cbbe38b 100644
--- a/drivers/media/video/ivtv/ivtvfb.c
+++ b/drivers/media/video/ivtv/ivtvfb.c
@@ -128,15 +128,15 @@ MODULE_LICENSE("GPL");
 #define IVTV_FB_DEBUG(x, type, fmt, args...) \
         do { \
                 if ((x) & ivtv_fb_debug) \
-                        printk(KERN_INFO "ivtv-fb%d " type ": " fmt, itv->num , ## args); \
+                        printk(KERN_INFO "ivtvfb%d " type ": " fmt, itv->num , ## args); \
         } while (0)
 #define IVTV_FB_DEBUG_WARN(fmt, args...)  IVTV_FB_DEBUG(IVTV_FB_DBGFLG_WARN, "warning", fmt , ## args)
 #define IVTV_FB_DEBUG_INFO(fmt, args...)  IVTV_FB_DEBUG(IVTV_FB_DBGFLG_INFO, "info", fmt , ## args)
 
 /* Standard kernel messages */
-#define IVTV_FB_ERR(fmt, args...)   printk(KERN_ERR  "ivtv-fb%d: " fmt, itv->num , ## args)
-#define IVTV_FB_WARN(fmt, args...)  printk(KERN_WARNING  "ivtv-fb%d: " fmt, itv->num , ## args)
-#define IVTV_FB_INFO(fmt, args...)  printk(KERN_INFO "ivtv-fb%d: " fmt, itv->num , ## args)
+#define IVTV_FB_ERR(fmt, args...)   printk(KERN_ERR  "ivtvfb%d: " fmt, itv->num , ## args)
+#define IVTV_FB_WARN(fmt, args...)  printk(KERN_WARNING  "ivtvfb%d: " fmt, itv->num , ## args)
+#define IVTV_FB_INFO(fmt, args...)  printk(KERN_INFO "ivtvfb%d: " fmt, itv->num , ## args)
 
 /* --------------------------------------------------------------------- */
 
@@ -1143,7 +1143,7 @@ static int __init ivtvfb_init(void)
         int i, registered = 0;
 
         if (ivtv_fb_card_id < -1 || ivtv_fb_card_id >= IVTV_MAX_CARDS) {
-                printk(KERN_ERR "ivtv-fb:  ivtv_fb_card_id parameter is out of range (valid range: -1 - %d)\n",
+                printk(KERN_ERR "ivtvfb:  ivtv_fb_card_id parameter is out of range (valid range: -1 - %d)\n",
                      IVTV_MAX_CARDS - 1);
                 return -EINVAL;
         }
@@ -1161,7 +1161,7 @@ static int __init ivtvfb_init(void)
                 }
         }
         if (!registered) {
-                printk(KERN_ERR "ivtv-fb:  no cards found");
+                printk(KERN_ERR "ivtvfb:  no cards found");
                 return -ENODEV;
         }
         return 0;
@@ -1172,7 +1172,7 @@ static void ivtvfb_cleanup(void)
         struct ivtv *itv;
         int i;
 
-        printk(KERN_INFO "ivtv-fb:  Unloading framebuffer module\n");
+        printk(KERN_INFO "ivtvfb:  Unloading framebuffer module\n");
 
         for (i = 0; i < ivtv_cards_active; i++) {
                 itv = ivtv_cards[i];