* bttv-cards.c, bttv-driver.c:

        * msp3400.c, tda9887.c, tuner-core.c:
        - Step one, in preparation for 2.6.14-rcX compatability:
          -#ifdef MM_KERNEL
          +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)

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

6 files changed, 11 insertions, 11 deletions

diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index 72bc3535d..f6efc14d3 100644
--- a/linux/drivers/media/video/bttv-cards.c
+++ b/linux/drivers/media/video/bttv-cards.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-cards.c,v 1.75 2005/09/11 05:39:23 mkrufky Exp $
+    $Id: bttv-cards.c,v 1.76 2005/09/13 16:25:54 mkrufky Exp $
 
     bttv-cards.c
 
@@ -4614,7 +4614,7 @@ void __devinit bttv_check_chipset(void)
 	}
 	if (UNSET != latency)
 		printk(KERN_INFO "bttv: pci latency fixup [%d]\n",latency);
-#ifdef MM_KERNEL
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 	while ((dev = pci_get_device(PCI_VENDOR_ID_INTEL,
 				      PCI_DEVICE_ID_INTEL_82441, dev))) {
 #else
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index b89803a67..e7c99d04e 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.56 2005/09/07 05:13:09 mkrufky Exp $
+    $Id: bttv-driver.c,v 1.57 2005/09/13 16:25:54 mkrufky Exp $
 
     bttv - Bt848 frame grabber driver
 
@@ -4112,7 +4112,7 @@ static int bttv_suspend(struct pci_dev *pci_dev, pm_message_t state)
 	struct bttv_buffer_set idle;
 	unsigned long flags;
 
-#ifdef MM_KERNEL
+#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);
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index b13583860..9664fa119 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -1448,7 +1448,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);
 
-#ifdef MM_KERNEL
+#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);
@@ -1857,7 +1857,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	return 0;
 }
 
-#ifdef MM_KERNEL
+#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)
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index b13583860..9664fa119 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -1448,7 +1448,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);
 
-#ifdef MM_KERNEL
+#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);
@@ -1857,7 +1857,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	return 0;
 }
 
-#ifdef MM_KERNEL
+#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)
diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index 2850bc956..68ada1fbf 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -816,7 +816,7 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	return 0;
 }
 
-#ifdef MM_KERNEL
+#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)
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 17d8cd3ff..b8351f70f 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.70 2005/09/12 20:11:06 hhackmann Exp $
+ * $Id: tuner-core.c,v 1.71 2005/09/13 16:25:54 mkrufky Exp $
  *
  * i2c tv tuner chip device driver
  * core core, i.e. kernel interfaces, registering and so on
@@ -715,7 +715,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	return 0;
 }
 
-#ifdef MM_KERNEL
+#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)