fixed cvs compile for 2.6.13

5 files changed, 23 insertions, 23 deletions

diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index c137b8532..69f205941 100644
--- a/linux/drivers/media/video/bttv-driver.c
+++ b/linux/drivers/media/video/bttv-driver.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-driver.c,v 1.45 2005/07/20 19:43:24 mkrufky Exp $
+    $Id: bttv-driver.c,v 1.46 2005/07/30 19:45:31 mkrufky Exp $
 
     bttv - Bt848 frame grabber driver
 
@@ -4060,10 +4060,10 @@ static int bttv_suspend(struct pci_dev *pci_dev, pm_message_t state)
 	struct bttv_buffer_set idle;
 	unsigned long flags;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-	dprintk("bttv%d: suspend %d\n", btv->c.nr, state);
-#else
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 	dprintk("bttv%d: suspend %d\n", btv->c.nr, state.event);
+#else
+	dprintk("bttv%d: suspend %d\n", btv->c.nr, state);
 #endif
 
 	/* stop dma + irqs */
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index 97440f099..9b5d929e8 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -1444,10 +1444,10 @@ static int msp_detach(struct i2c_client *client);
 static int msp_probe(struct i2c_adapter *adap);
 static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-static int msp_suspend(struct device * dev, u32 state, u32 level);
-#else
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 static int msp_suspend(struct device * dev, pm_message_t state, u32 level);
+#else
+static int msp_suspend(struct device * dev, u32 state, u32 level);
 #endif
 static int msp_resume(struct device * dev, u32 level);
 
@@ -1853,10 +1853,10 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	return 0;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-static int msp_suspend(struct device * dev, u32 state, u32 level)
-#else
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 static int msp_suspend(struct device * dev, pm_message_t state, u32 level)
+#else
+static int msp_suspend(struct device * dev, u32 state, u32 level)
 #endif
 {
 	struct i2c_client *c = container_of(dev, struct i2c_client, dev);
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index 97440f099..9b5d929e8 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -1444,10 +1444,10 @@ static int msp_detach(struct i2c_client *client);
 static int msp_probe(struct i2c_adapter *adap);
 static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-static int msp_suspend(struct device * dev, u32 state, u32 level);
-#else
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 static int msp_suspend(struct device * dev, pm_message_t state, u32 level);
+#else
+static int msp_suspend(struct device * dev, u32 state, u32 level);
 #endif
 static int msp_resume(struct device * dev, u32 level);
 
@@ -1853,10 +1853,10 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	return 0;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-static int msp_suspend(struct device * dev, u32 state, u32 level)
-#else
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 static int msp_suspend(struct device * dev, pm_message_t state, u32 level)
+#else
+static int msp_suspend(struct device * dev, u32 state, u32 level)
 #endif
 {
 	struct i2c_client *c = container_of(dev, struct i2c_client, dev);
diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index 001cfce64..0ff39da1f 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -792,10 +792,10 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	return 0;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-static int tda9887_suspend(struct device * dev, u32 state, u32 level)
-#else
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 static int tda9887_suspend(struct device * dev, pm_message_t state, u32 level)
+#else
+static int tda9887_suspend(struct device * dev, u32 state, u32 level)
 #endif
 {
 	dprintk("tda9887: suspend\n");
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 4dfb65b6a..9bde3f9a1 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tuner-core.c,v 1.63 2005/07/28 18:19:55 mchehab Exp $
+ * $Id: tuner-core.c,v 1.64 2005/07/30 19:45:31 mkrufky Exp $
  *
  * i2c tv tuner chip device driver
  * core core, i.e. kernel interfaces, registering and so on
@@ -682,10 +682,10 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	return 0;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-static int tuner_suspend(struct device *dev, u32 state, u32 level)
-#else
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 static int tuner_suspend(struct device *dev, pm_message_t state, u32 level)
+#else
+static int tuner_suspend(struct device *dev, u32 state, u32 level)
 #endif
 {
 	struct i2c_client *c = container_of (dev, struct i2c_client, dev);