* bttv-driver.c, msp3400.c, tda9887.c, tuner-core.c:

        * Makefile, scripts/merge-trees.sh, scripts/unmerge-trees.sh:
        - Fix cvs compile to work for both latest -linus and -mm trees.

        Signed-off-by: Michael Krufky <mkrufky@m1k.net>

5 files changed, 9 insertions, 9 deletions

diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index 69f205941..571d7c4a4 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.46 2005/07/30 19:45:31 mkrufky Exp $
+    $Id: bttv-driver.c,v 1.47 2005/07/30 19:47:02 mkrufky Exp $
 
     bttv - Bt848 frame grabber driver
 
@@ -4060,7 +4060,7 @@ 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)
+#ifdef MM_KERNEL
 	dprintk("bttv%d: suspend %d\n", btv->c.nr, state.event);
 #else
 	dprintk("bttv%d: suspend %d\n", btv->c.nr, state);
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index 9b5d929e8..4d81952ff 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -1444,7 +1444,7 @@ 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)
+#ifdef MM_KERNEL
 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);
@@ -1853,7 +1853,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	return 0;
 }
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
+#ifdef MM_KERNEL
 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)
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index 9b5d929e8..4d81952ff 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -1444,7 +1444,7 @@ 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)
+#ifdef MM_KERNEL
 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);
@@ -1853,7 +1853,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	return 0;
 }
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
+#ifdef MM_KERNEL
 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)
diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index 0ff39da1f..8fad25d2b 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -792,7 +792,7 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	return 0;
 }
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
+#ifdef MM_KERNEL
 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)
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 9bde3f9a1..dffed3237 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.64 2005/07/30 19:45:31 mkrufky Exp $
+ * $Id: tuner-core.c,v 1.65 2005/07/30 19:47:02 mkrufky Exp $
  *
  * i2c tv tuner chip device driver
  * core core, i.e. kernel interfaces, registering and so on
@@ -682,7 +682,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	return 0;
 }
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
+#ifdef MM_KERNEL
 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)