V4L/DVB (3269): ioctls cleanups.

[pandora-kernel.git] / drivers / media / video / em28xx / em28xx.h

diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 1e2ee43..f99ee8e 100644 (file)
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -216,6 +216,8 @@ struct em28xx {
        unsigned int has_msp34xx:1;
        unsigned int has_tda9887:1;
 
+       u32 i2s_speed;          /* I2S speed for audio digital stream */
+
        enum em28xx_decoder decoder;
 
        int tuner_type;         /* type of the tuner */
@@ -293,8 +295,6 @@ void em28xx_set_ir(struct em28xx * dev,struct IR_i2c *ir);
 
 /* Provided by em28xx-core.c */
 
-void em28xx_print_ioctl(char *name, unsigned int cmd);
-
 u32 em28xx_request_buffers(struct em28xx *dev, u32 count);
 void em28xx_queue_unusedframes(struct em28xx *dev);
 void em28xx_release_buffers(struct em28xx *dev);
@@ -392,18 +392,18 @@ extern const unsigned int em28xx_bcount;
 /* printk macros */
 
 #define em28xx_err(fmt, arg...) do {\
-       printk(KERN_ERR fmt, ##arg); } while (0)
+       printk(KERN_ERR fmt , ##arg); } while (0)
 
 #define em28xx_errdev(fmt, arg...) do {\
        printk(KERN_ERR "%s: "fmt,\
-                       dev->name, ##arg); } while (0)
+                       dev->name , ##arg); } while (0)
 
 #define em28xx_info(fmt, arg...) do {\
        printk(KERN_INFO "%s: "fmt,\
-                       dev->name, ##arg); } while (0)
+                       dev->name , ##arg); } while (0)
 #define em28xx_warn(fmt, arg...) do {\
        printk(KERN_WARNING "%s: "fmt,\
-                       dev->name, ##arg); } while (0)
+                       dev->name , ##arg); } while (0)
 
 inline static int em28xx_audio_source(struct em28xx *dev, int input)
 {