- Fix broken i2c irq transfer, due to Holger's changes

- clean up the mxb driver and it's helper modules (rename the
  structures, add GPL license to the appropriate files, c99
  initialisers)
- fix 2.5.55 "module insertion causes bug in kobject.o" issue
- fixed missing exported symbols in budget-core

1 files changed, 12 insertions, 7 deletions

diff --git a/linux/drivers/media/video/mxb.c b/linux/drivers/media/video/mxb.c
index 29be50726..b12daa05d 100644
--- a/linux/drivers/media/video/mxb.c
+++ b/linux/drivers/media/video/mxb.c
@@ -18,7 +18,8 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <saa7146_vv.h>
+#define DEBUG_VARIABLE debug
+#include "saa7146_vv.h"
 
 #include "mxb.h"
 #include "tea6415c.h"
@@ -69,10 +70,13 @@ static int mxb_num = 0;
    in verden (lower saxony, germany) 4148 is a
    channel called "phoenix" */
 static int freq = 4148;
-
 MODULE_PARM(freq,"i");
 MODULE_PARM_DESC(freq, "initial frequency the tuner will be tuned to while setup");
 
+static int debug = 0;
+MODULE_PARM(debug,"i");
+MODULE_PARM_DESC(debug, "debug verbosity");
+
 #define MXB_INPUTS 4
 enum { TUNER, AUX1, AUX3, AUX3_YC };
 
@@ -102,7 +106,7 @@ static int video_audio_connect[MXB_AUDIOS] =
 
 /* these are the necessary input-output-pins for bringing one audio source
 (see above) to the CD-output */
-static struct audio_multiplex TEA6420_cd[MXB_AUDIOS+1][2] =
+static struct tea6420_multiplex TEA6420_cd[MXB_AUDIOS+1][2] =
 		{ 
 		{{1,1,0},{1,1,0}},	/* Tuner */
 		{{5,1,0},{6,1,0}},	/* AUX 1 */
@@ -115,7 +119,7 @@ static struct audio_multiplex TEA6420_cd[MXB_AUDIOS+1][2] =
 
 /* these are the necessary input-output-pins for bringing one audio source
 (see above) to the line-output */
-static struct audio_multiplex TEA6420_line[MXB_AUDIOS+1][2] =
+static struct tea6420_multiplex TEA6420_line[MXB_AUDIOS+1][2] =
 		{
 		{{2,3,0},{1,2,0}},
 		{{5,3,0},{6,2,0}},
@@ -237,7 +241,8 @@ static int mxb_probe(struct saa7146_dev* dev)
 	/* check if all devices are present */
 	if(    0 == mxb->tea6420_1	|| 0 == mxb->tea6420_2	|| 0 == mxb->tea6415c
 	    || 0 == mxb->tda9840	|| 0 == mxb->saa7111a	|| 0 == mxb->tuner ) {
-		DEB_D(("this saa7146 is not on an mxb.\n"));	
+		printk("mxb: did not find all i2c devices. are you sure you\n");
+		printk("mxb: insmod'ed tea6420, tea6415c, saa7111, tea6415c and tuner?\n");
 		i2c_del_adapter(&mxb->i2c_adapter);
 		kfree(mxb);
 		return -ENODEV;
@@ -349,7 +354,7 @@ static int mxb_init_done(struct saa7146_dev* dev)
 	struct i2c_msg msg;
 
 	int i = 0, err = 0;
-	struct	tea6415c_video_multiplex vm;	
+	struct	tea6415c_multiplex vm;	
 
 	/* write configuration to saa7111a */
 	i = i2c_master_send(mxb->saa7111a, init, sizeof(init));
@@ -648,7 +653,7 @@ static int mxb_ioctl(struct saa7146_dev *dev, unsigned int cmd, void *arg)
 	case VIDIOC_S_INPUT:
 	{
 		int input = *(int *)arg;
-		struct	tea6415c_video_multiplex vm;	
+		struct	tea6415c_multiplex vm;	
 		int i = 0;
 
 		DEB_EE(("VIDIOC_S_INPUT %d.\n",input));