Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

[linux-2.6-omap-h63xx.git] / drivers / staging / go7007 / wis-sony-tuner.c

diff --git a/drivers/staging/go7007/wis-sony-tuner.c b/drivers/staging/go7007/wis-sony-tuner.c
index 5997fb4794596c237bcf9b203fc7550306516f18..58fddb12237239b7acae3e75ba2f70c48c7745ee 100644 (file)
--- a/drivers/staging/go7007/wis-sony-tuner.c
+++ b/drivers/staging/go7007/wis-sony-tuner.c
@@ -17,7 +17,6 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/version.h>
 #include <linux/i2c.h>
 #include <linux/videodev2.h>
 #include <media/tuner.h>
@@ -605,7 +604,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
        {
                struct v4l2_tuner *tun = arg;
 
-               memset(t, 0, sizeof(*tun));
+               memset(tun, 0, sizeof(*tun));
                strcpy(tun->name, "Television");
                tun->type = V4L2_TUNER_ANALOG_TV;
                tun->rangelow = 0UL; /* does anything use these? */