aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/ivtv/Kconfig2
-rw-r--r--drivers/media/video/ivtv/ivtv-driver.c2
-rw-r--r--drivers/media/video/ivtv/ivtv-driver.h2
-rw-r--r--drivers/media/video/ivtv/ivtvfb.c14
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
41 homepage at <http://www.ivtvdriver.org>. 41 homepage at <http://www.ivtvdriver.org>.
42 42
43 To compile this driver as a module, choose M here: the 43 To compile this driver as a module, choose M here: the
44 module will be called ivtv-fb. 44 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)
1397 spin_unlock(&ivtv_cards_lock); 1397 spin_unlock(&ivtv_cards_lock);
1398} 1398}
1399 1399
1400/* Note: These symbols are exported because they are used by the ivtv-fb 1400/* Note: These symbols are exported because they are used by the ivtvfb
1401 framebuffer module and an infrared module for the IR-blaster. */ 1401 framebuffer module and an infrared module for the IR-blaster. */
1402EXPORT_SYMBOL(ivtv_set_irq_mask); 1402EXPORT_SYMBOL(ivtv_set_irq_mask);
1403EXPORT_SYMBOL(ivtv_cards_active); 1403EXPORT_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 {
695 u32 osd_chroma_key; /* current chroma key */ 695 u32 osd_chroma_key; /* current chroma key */
696 struct v4l2_rect osd_rect; /* current OSD position and size */ 696 struct v4l2_rect osd_rect; /* current OSD position and size */
697 struct v4l2_rect main_rect; /* current Main window position and size */ 697 struct v4l2_rect main_rect; /* current Main window position and size */
698 struct osd_info *osd_info; /* ivtv-fb private OSD info */ 698 struct osd_info *osd_info; /* ivtvfb private OSD info */
699}; 699};
700 700
701/* Globals */ 701/* 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");
128#define IVTV_FB_DEBUG(x, type, fmt, args...) \ 128#define IVTV_FB_DEBUG(x, type, fmt, args...) \
129 do { \ 129 do { \
130 if ((x) & ivtv_fb_debug) \ 130 if ((x) & ivtv_fb_debug) \
131 printk(KERN_INFO "ivtv-fb%d " type ": " fmt, itv->num , ## args); \ 131 printk(KERN_INFO "ivtvfb%d " type ": " fmt, itv->num , ## args); \
132 } while (0) 132 } while (0)
133#define IVTV_FB_DEBUG_WARN(fmt, args...) IVTV_FB_DEBUG(IVTV_FB_DBGFLG_WARN, "warning", fmt , ## args) 133#define IVTV_FB_DEBUG_WARN(fmt, args...) IVTV_FB_DEBUG(IVTV_FB_DBGFLG_WARN, "warning", fmt , ## args)
134#define IVTV_FB_DEBUG_INFO(fmt, args...) IVTV_FB_DEBUG(IVTV_FB_DBGFLG_INFO, "info", fmt , ## args) 134#define IVTV_FB_DEBUG_INFO(fmt, args...) IVTV_FB_DEBUG(IVTV_FB_DBGFLG_INFO, "info", fmt , ## args)
135 135
136/* Standard kernel messages */ 136/* Standard kernel messages */
137#define IVTV_FB_ERR(fmt, args...) printk(KERN_ERR "ivtv-fb%d: " fmt, itv->num , ## args) 137#define IVTV_FB_ERR(fmt, args...) printk(KERN_ERR "ivtvfb%d: " fmt, itv->num , ## args)
138#define IVTV_FB_WARN(fmt, args...) printk(KERN_WARNING "ivtv-fb%d: " fmt, itv->num , ## args) 138#define IVTV_FB_WARN(fmt, args...) printk(KERN_WARNING "ivtvfb%d: " fmt, itv->num , ## args)
139#define IVTV_FB_INFO(fmt, args...) printk(KERN_INFO "ivtv-fb%d: " fmt, itv->num , ## args) 139#define IVTV_FB_INFO(fmt, args...) printk(KERN_INFO "ivtvfb%d: " fmt, itv->num , ## args)
140 140
141/* --------------------------------------------------------------------- */ 141/* --------------------------------------------------------------------- */
142 142
@@ -1143,7 +1143,7 @@ static int __init ivtvfb_init(void)
1143 int i, registered = 0; 1143 int i, registered = 0;
1144 1144
1145 if (ivtv_fb_card_id < -1 || ivtv_fb_card_id >= IVTV_MAX_CARDS) { 1145 if (ivtv_fb_card_id < -1 || ivtv_fb_card_id >= IVTV_MAX_CARDS) {
1146 printk(KERN_ERR "ivtv-fb: ivtv_fb_card_id parameter is out of range (valid range: -1 - %d)\n", 1146 printk(KERN_ERR "ivtvfb: ivtv_fb_card_id parameter is out of range (valid range: -1 - %d)\n",
1147 IVTV_MAX_CARDS - 1); 1147 IVTV_MAX_CARDS - 1);
1148 return -EINVAL; 1148 return -EINVAL;
1149 } 1149 }
@@ -1161,7 +1161,7 @@ static int __init ivtvfb_init(void)
1161 } 1161 }
1162 } 1162 }
1163 if (!registered) { 1163 if (!registered) {
1164 printk(KERN_ERR "ivtv-fb: no cards found"); 1164 printk(KERN_ERR "ivtvfb: no cards found");
1165 return -ENODEV; 1165 return -ENODEV;
1166 } 1166 }
1167 return 0; 1167 return 0;
@@ -1172,7 +1172,7 @@ static void ivtvfb_cleanup(void)
1172 struct ivtv *itv; 1172 struct ivtv *itv;
1173 int i; 1173 int i;
1174 1174
1175 printk(KERN_INFO "ivtv-fb: Unloading framebuffer module\n"); 1175 printk(KERN_INFO "ivtvfb: Unloading framebuffer module\n");
1176 1176
1177 for (i = 0; i < ivtv_cards_active; i++) { 1177 for (i = 0; i < ivtv_cards_active; i++) {
1178 itv = ivtv_cards[i]; 1178 itv = ivtv_cards[i];