Wrong version testing... fixed.

From: Mauro Carvalho Chehab <mchehab@infradead.org>

kernel-sync.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

4 files changed, 54 insertions, 54 deletions

diff --git a/linux/drivers/media/video/cx88/cx88-alsa.c b/linux/drivers/media/video/cx88/cx88-alsa.c
index cd3fa72fc..80aef2421 100644
--- a/linux/drivers/media/video/cx88/cx88-alsa.c
+++ b/linux/drivers/media/video/cx88/cx88-alsa.c
@@ -65,7 +65,7 @@ struct cx88_audio_dev {
 	/* audio controls */
 	int                        irq;
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 	snd_card_t                 *card;
 #else
 	struct snd_card            *card;
@@ -88,7 +88,7 @@ struct cx88_audio_dev {
 	struct cx88_buffer   *buf;
 
 	long opened;
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 	snd_pcm_substream_t *substream;
 #else
 	struct snd_pcm_substream *substream;
@@ -109,7 +109,7 @@ typedef struct cx88_audio_dev snd_cx88_card_t;
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */
 static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static snd_card_t *snd_cx88_cards[SNDRV_CARDS];
 #else
 static struct snd_card *snd_cx88_cards[SNDRV_CARDS];
@@ -346,7 +346,7 @@ static int dsp_buffer_free(snd_cx88_card_t *chip)
 /*
  * Digital hardware definition
  */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static snd_pcm_hardware_t snd_cx88_digital_hw = {
 #else
 static struct snd_pcm_hardware snd_cx88_digital_hw = {
@@ -372,7 +372,7 @@ static struct snd_pcm_hardware snd_cx88_digital_hw = {
 /*
  * audio pcm capture runtime free
  */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static void snd_card_cx88_runtime_free(snd_pcm_runtime_t *runtime)
 #else
 static void snd_card_cx88_runtime_free(struct snd_pcm_runtime *runtime)
@@ -382,14 +382,14 @@ static void snd_card_cx88_runtime_free(struct snd_pcm_runtime *runtime)
 /*
  * audio pcm capture open callback
  */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_cx88_pcm_open(snd_pcm_substream_t *substream)
 #else
 static int snd_cx88_pcm_open(struct snd_pcm_substream *substream)
 #endif
 {
 	snd_cx88_card_t *chip = snd_pcm_substream_chip(substream);
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 	snd_pcm_runtime_t *runtime = substream->runtime;
 #else
 	struct snd_pcm_runtime *runtime = substream->runtime;
@@ -422,7 +422,7 @@ _error:
 /*
  * audio close callback
  */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_cx88_close(snd_pcm_substream_t *substream)
 #else
 static int snd_cx88_close(struct snd_pcm_substream *substream)
@@ -439,7 +439,7 @@ static int snd_cx88_close(struct snd_pcm_substream *substream)
 /*
  * hw_params callback
  */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_cx88_hw_params(snd_pcm_substream_t * substream,
 				 snd_pcm_hw_params_t * hw_params)
 #else
@@ -504,7 +504,7 @@ static int snd_cx88_hw_params(struct snd_pcm_substream * substream,
 /*
  * hw free callback
  */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_cx88_hw_free(snd_pcm_substream_t * substream)
 #else
 static int snd_cx88_hw_free(struct snd_pcm_substream * substream)
@@ -524,7 +524,7 @@ static int snd_cx88_hw_free(struct snd_pcm_substream * substream)
 /*
  * prepare callback
  */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_cx88_prepare(snd_pcm_substream_t *substream)
 #else
 static int snd_cx88_prepare(struct snd_pcm_substream *substream)
@@ -537,7 +537,7 @@ static int snd_cx88_prepare(struct snd_pcm_substream *substream)
 /*
  * trigger callback
  */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_cx88_card_trigger(snd_pcm_substream_t *substream, int cmd)
 #else
 static int snd_cx88_card_trigger(struct snd_pcm_substream *substream, int cmd)
@@ -568,14 +568,14 @@ static int snd_cx88_card_trigger(struct snd_pcm_substream *substream, int cmd)
 /*
  * pointer callback
  */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static snd_pcm_uframes_t snd_cx88_pointer(snd_pcm_substream_t *substream)
 #else
 static snd_pcm_uframes_t snd_cx88_pointer(struct snd_pcm_substream *substream)
 #endif
 {
 	snd_cx88_card_t *chip = snd_pcm_substream_chip(substream);
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 	snd_pcm_runtime_t *runtime = substream->runtime;
 #else
 	struct snd_pcm_runtime *runtime = substream->runtime;
@@ -596,7 +596,7 @@ static snd_pcm_uframes_t snd_cx88_pointer(struct snd_pcm_substream *substream)
 /*
  * operators
  */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static snd_pcm_ops_t snd_cx88_pcm_ops = {
 #else
 static struct snd_pcm_ops snd_cx88_pcm_ops = {
@@ -617,7 +617,7 @@ static struct snd_pcm_ops snd_cx88_pcm_ops = {
 static int __devinit snd_cx88_pcm(snd_cx88_card_t *chip, int device, char *name)
 {
 	int err;
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 	snd_pcm_t *pcm;
 #else
 	struct snd_pcm *pcm;
@@ -636,7 +636,7 @@ static int __devinit snd_cx88_pcm(snd_cx88_card_t *chip, int device, char *name)
 /****************************************************************************
 				CONTROL INTERFACE
  ****************************************************************************/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_cx88_capture_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *info)
 #else
 static int snd_cx88_capture_volume_info(struct snd_kcontrol *kcontrol,
@@ -652,7 +652,7 @@ static int snd_cx88_capture_volume_info(struct snd_kcontrol *kcontrol,
 }
 
 /* OK - TODO: test it */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_cx88_capture_volume_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *value)
 #else
 static int snd_cx88_capture_volume_get(struct snd_kcontrol *kcontrol,
@@ -668,7 +668,7 @@ static int snd_cx88_capture_volume_get(struct snd_kcontrol *kcontrol,
 }
 
 /* OK - TODO: test it */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_cx88_capture_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *value)
 #else
 static int snd_cx88_capture_volume_put(struct snd_kcontrol *kcontrol,
@@ -689,7 +689,7 @@ static int snd_cx88_capture_volume_put(struct snd_kcontrol *kcontrol,
 	return v != old_control;
 }
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static snd_kcontrol_new_t snd_cx88_capture_volume = {
 #else
 static struct snd_kcontrol_new snd_cx88_capture_volume = {
@@ -739,7 +739,7 @@ static int snd_cx88_free(snd_cx88_card_t *chip)
 /*
  * Component Destructor
  */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static void snd_cx88_dev_free(snd_card_t * card)
 #else
 static void snd_cx88_dev_free(struct snd_card * card)
@@ -756,7 +756,7 @@ static void snd_cx88_dev_free(struct snd_card * card)
  */
 
 static int devno;
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int __devinit snd_cx88_create(snd_card_t *card, struct pci_dev *pci,
 				    snd_cx88_card_t **rchip)
 #else
@@ -834,7 +834,7 @@ static int __devinit snd_cx88_create(struct snd_card *card,
 static int __devinit cx88_audio_initdev(struct pci_dev *pci,
 				    const struct pci_device_id *pci_id)
 {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 	snd_card_t       *card;
 #else
 	struct snd_card  *card;
diff --git a/linux/drivers/media/video/saa7134/saa7134-alsa.c b/linux/drivers/media/video/saa7134/saa7134-alsa.c
index f670f4c8c..54fc877ba 100644
--- a/linux/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/linux/drivers/media/video/saa7134/saa7134-alsa.c
@@ -80,7 +80,7 @@ MODULE_PARM_DESC(enable, "Enable (or not) the SAA7134 capture interface(s).");
  */
 
 typedef struct snd_card_saa7134 {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 	snd_card_t *card;
 #else
 	struct snd_card *card;
@@ -111,14 +111,14 @@ typedef struct snd_card_saa7134_pcm {
 
 	spinlock_t lock;
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 	snd_pcm_substream_t *substream;
 #else
 	struct snd_pcm_substream *substream;
 #endif
 } snd_card_saa7134_pcm_t;
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static snd_card_t *snd_saa7134_cards[SNDRV_CARDS];
 #else
 static struct snd_card *snd_saa7134_cards[SNDRV_CARDS];
@@ -275,14 +275,14 @@ out:
  *
  */
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_card_saa7134_capture_trigger(snd_pcm_substream_t * substream,
 #else
 static int snd_card_saa7134_capture_trigger(struct snd_pcm_substream * substream,
 #endif
 					  int cmd)
 {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 	snd_pcm_runtime_t *runtime = substream->runtime;
 #else
 	struct snd_pcm_runtime *runtime = substream->runtime;
@@ -364,13 +364,13 @@ static int dsp_buffer_free(struct saa7134_dev *dev)
  *
  */
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_card_saa7134_capture_prepare(snd_pcm_substream_t * substream)
 #else
 static int snd_card_saa7134_capture_prepare(struct snd_pcm_substream * substream)
 #endif
 {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 	snd_pcm_runtime_t *runtime = substream->runtime;
 #else
 	struct snd_pcm_runtime *runtime = substream->runtime;
@@ -461,14 +461,14 @@ static int snd_card_saa7134_capture_prepare(struct snd_pcm_substream * substream
  *
  */
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static snd_pcm_uframes_t snd_card_saa7134_capture_pointer(snd_pcm_substream_t * substream)
 #else
 static snd_pcm_uframes_t
 snd_card_saa7134_capture_pointer(struct snd_pcm_substream * substream)
 #endif
 {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 	snd_pcm_runtime_t *runtime = substream->runtime;
 #else
 	struct snd_pcm_runtime *runtime = substream->runtime;
@@ -490,7 +490,7 @@ snd_card_saa7134_capture_pointer(struct snd_pcm_substream * substream)
  * ALSA hardware capabilities definition
  */
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static snd_pcm_hardware_t snd_card_saa7134_capture =
 #else
 static struct snd_pcm_hardware snd_card_saa7134_capture =
@@ -517,7 +517,7 @@ static struct snd_pcm_hardware snd_card_saa7134_capture =
 	.periods_max =		1024,
 };
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static void snd_card_saa7134_runtime_free(snd_pcm_runtime_t *runtime)
 #else
 static void snd_card_saa7134_runtime_free(struct snd_pcm_runtime *runtime)
@@ -538,7 +538,7 @@ static void snd_card_saa7134_runtime_free(struct snd_pcm_runtime *runtime)
  *
  */
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_card_saa7134_hw_params(snd_pcm_substream_t * substream,
 				    snd_pcm_hw_params_t * hw_params)
 #else
@@ -623,7 +623,7 @@ static int snd_card_saa7134_hw_params(struct snd_pcm_substream * substream,
  *
  */
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_card_saa7134_hw_free(snd_pcm_substream_t * substream)
 #else
 static int snd_card_saa7134_hw_free(struct snd_pcm_substream * substream)
@@ -653,7 +653,7 @@ static int snd_card_saa7134_hw_free(struct snd_pcm_substream * substream)
  *
  */
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_card_saa7134_capture_close(snd_pcm_substream_t * substream)
 #else
 static int snd_card_saa7134_capture_close(struct snd_pcm_substream * substream)
@@ -672,13 +672,13 @@ static int snd_card_saa7134_capture_close(struct snd_pcm_substream * substream)
  *
  */
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_card_saa7134_capture_open(snd_pcm_substream_t * substream)
 #else
 static int snd_card_saa7134_capture_open(struct snd_pcm_substream * substream)
 #endif
 {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 	snd_pcm_runtime_t *runtime = substream->runtime;
 #else
 	struct snd_pcm_runtime *runtime = substream->runtime;
@@ -718,7 +718,7 @@ static int snd_card_saa7134_capture_open(struct snd_pcm_substream * substream)
  * ALSA capture callbacks definition
  */
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static snd_pcm_ops_t snd_card_saa7134_capture_ops = {
 #else
 static struct snd_pcm_ops snd_card_saa7134_capture_ops = {
@@ -743,7 +743,7 @@ static struct snd_pcm_ops snd_card_saa7134_capture_ops = {
 
 static int snd_card_saa7134_pcm(snd_card_saa7134_t *saa7134, int device)
 {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 	snd_pcm_t *pcm;
 #else
 	struct snd_pcm *pcm;
@@ -765,7 +765,7 @@ static int snd_card_saa7134_pcm(snd_card_saa7134_t *saa7134, int device)
   .get = snd_saa7134_volume_get, .put = snd_saa7134_volume_put, \
   .private_value = addr }
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_saa7134_volume_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo)
 #else
 static int snd_saa7134_volume_info(struct snd_kcontrol * kcontrol,
@@ -779,7 +779,7 @@ static int snd_saa7134_volume_info(struct snd_kcontrol * kcontrol,
 	return 0;
 }
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_saa7134_volume_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 #else
 static int snd_saa7134_volume_get(struct snd_kcontrol * kcontrol,
@@ -794,7 +794,7 @@ static int snd_saa7134_volume_get(struct snd_kcontrol * kcontrol,
 	return 0;
 }
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_saa7134_volume_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 #else
 static int snd_saa7134_volume_put(struct snd_kcontrol * kcontrol,
@@ -830,7 +830,7 @@ static int snd_saa7134_volume_put(struct snd_kcontrol * kcontrol,
   .get = snd_saa7134_capsrc_get, .put = snd_saa7134_capsrc_put, \
   .private_value = addr }
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_saa7134_capsrc_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo)
 #else
 static int snd_saa7134_capsrc_info(struct snd_kcontrol * kcontrol,
@@ -844,7 +844,7 @@ static int snd_saa7134_capsrc_info(struct snd_kcontrol * kcontrol,
 	return 0;
 }
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_saa7134_capsrc_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 #else
 static int snd_saa7134_capsrc_get(struct snd_kcontrol * kcontrol,
@@ -862,7 +862,7 @@ static int snd_saa7134_capsrc_get(struct snd_kcontrol * kcontrol,
 	return 0;
 }
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static int snd_saa7134_capsrc_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 #else
 static int snd_saa7134_capsrc_put(struct snd_kcontrol * kcontrol,
@@ -944,7 +944,7 @@ static int snd_saa7134_capsrc_put(struct snd_kcontrol * kcontrol,
 	return change;
 }
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static snd_kcontrol_new_t snd_saa7134_controls[] = {
 #else
 static struct snd_kcontrol_new snd_saa7134_controls[] = {
@@ -967,7 +967,7 @@ SAA713x_CAPSRC("Line Capture Switch", 2, MIXER_ADDR_LINE2),
 
 static int snd_card_saa7134_new_mixer(snd_card_saa7134_t * chip)
 {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 	snd_card_t *card = chip->card;
 #else
 	struct snd_card *card = chip->card;
@@ -985,7 +985,7 @@ static int snd_card_saa7134_new_mixer(snd_card_saa7134_t * chip)
 	return 0;
 }
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 static void snd_saa7134_free(snd_card_t * card)
 #else
 static void snd_saa7134_free(struct snd_card * card)
@@ -1016,7 +1016,7 @@ static void snd_saa7134_free(struct snd_card * card)
 static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum)
 {
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 	snd_card_t *card;
 #else
 	struct snd_card *card;
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index 54070d135..8600c57b1 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -412,7 +412,7 @@ struct saa7134_dmasound {
 	unsigned int               read_count;
 	void *			   priv_data;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 	snd_pcm_substream_t        *substream;
 #else
 	struct snd_pcm_substream   *substream;
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c
index b74c0ec58..0f45028b3 100644
--- a/linux/sound/pci/bt87x.c
+++ b/linux/sound/pci/bt87x.c
@@ -821,7 +821,7 @@ static int __devinit snd_bt87x_detect_card(struct pci_dev *pci)
 	for (i = 0; i < ARRAY_SIZE(blacklist); ++i)
 		if (blacklist[i].subvendor == pci->subsystem_vendor &&
 		    blacklist[i].subdevice == pci->subsystem_device) {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 			snd_printdd(KERN_INFO "card %#04x:%#04x has no audio\n",
 				    pci->subsystem_vendor, pci->subsystem_device);
 #else
@@ -831,7 +831,7 @@ static int __devinit snd_bt87x_detect_card(struct pci_dev *pci)
 			return -EBUSY;
 		}
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
 	snd_printk(KERN_INFO "unknown card %#04x:%#04x, using default rate 32000\n",
 		   pci->subsystem_vendor, pci->subsystem_device);
 #else