From 4b05d47d452e4251b6e1b0bbd4393f113b9f6131 Mon Sep 17 00:00:00 2001 From: "Nickolay V. Shmyrev" Date: Tue, 25 Oct 2005 17:25:14 +0000 Subject: * ../linux/drivers/media/video/saa7134/saa7134-alsa.c: - Fix compilation with 2.6.8. Signed-off-by: Nickolay V. Shmyrev --- linux/drivers/media/video/saa7134/saa7134-alsa.c | 7 ++++++- v4l/ChangeLog | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/linux/drivers/media/video/saa7134/saa7134-alsa.c b/linux/drivers/media/video/saa7134/saa7134-alsa.c index 8c54d29e2..be20a796d 100644 --- a/linux/drivers/media/video/saa7134/saa7134-alsa.c +++ b/linux/drivers/media/video/saa7134/saa7134-alsa.c @@ -2,7 +2,7 @@ * SAA713x ALSA support for V4L * Ricardo Cerqueira * - * $Id: saa7134-alsa.c,v 1.9 2005/10/18 14:27:43 mchehab Exp $ + * $Id: saa7134-alsa.c,v 1.10 2005/10/25 17:25:14 nsh Exp $ * * Caveats: * - Volume doesn't work (it's always at max) @@ -95,6 +95,11 @@ typedef struct snd_card_saa7134 { spinlock_t lock; } snd_card_saa7134_t; + +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,8) +#define chip_t snd_card_saa7134_t +#endif + /* * PCM structure */ diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 38f8055ab..6dfafc139 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,10 @@ +2005-10-25 17:24 nshmyrev + + * ../linux/drivers/media/video/saa7134/saa7134-alsa.c: + - Fix compilation with 2.6.8. + + Signed-off-by: Nickolay V. Shmyrev + 2005-10-25 16:51 mkrufky * ../v4l/scripts/merge-trees.sh: -- cgit v1.2.3