Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / ttpci / budget.h

diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h
index e8a5c79178e1e229a331a07225ba521aca9c4434..dd450b739bff9bb21d56c2bc8d2dae3d6c4dab54 100644 (file)
--- a/drivers/media/dvb/ttpci/budget.h
+++ b/drivers/media/dvb/ttpci/budget.h
@@ -1,3 +1,4 @@
+
 #ifndef __BUDGET_DVB__
 #define __BUDGET_DVB__
 
@@ -21,7 +22,7 @@ extern int budget_debug;
 #endif
 
 #define dprintk(level,args...) \
-           do { if ((budget_debug & level)) { printk("%s: %s(): ", KBUILD_MODNAME, __FUNCTION__); printk(args); } } while (0)
+           do { if ((budget_debug & level)) { printk("%s: %s(): ", KBUILD_MODNAME, __func__); printk(args); } } while (0)
 
 struct budget_info {
        char *name;
@@ -99,6 +100,9 @@ static struct saa7146_pci_extension_data x_var = { \
 #define BUDGET_KNC1CP             12
 #define BUDGET_KNC1TP             13
 #define BUDGET_TVSTAR             14
+#define BUDGET_CIN1200C_MK3       15
+#define BUDGET_KNC1C_MK3          16
+#define BUDGET_KNC1CP_MK3         17
 
 #define BUDGET_VIDEO_PORTA         0
 #define BUDGET_VIDEO_PORTB         1