- distclean now cleans also .orig and .rej files

        - make update updates from CVS
        - make snapshot now distcleans and updates.

        Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

3 files changed, 33 insertions, 19 deletions

diff --git a/linux/drivers/media/video/saa7134/saa7134-alsa.c b/linux/drivers/media/video/saa7134/saa7134-alsa.c
index fff4aec63..9813a23ca 100644
--- a/linux/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/linux/drivers/media/video/saa7134/saa7134-alsa.c
@@ -1,7 +1,7 @@
 /*
  *   SAA713x ALSA support for V4L
  *
- *   $Id: saa7134-alsa.c,v 1.16 2005/11/08 00:33:20 rmcc Exp $
+ *   $Id: saa7134-alsa.c,v 1.17 2005/11/08 13:14:21 mchehab Exp $
  *
  *   Caveats:
  *        - Volume doesn't work (it's always at max)
@@ -128,7 +128,7 @@ static void saa7134_dma_stop(struct saa7134_dev *dev)
  *
  *   Called when preparing the capture device for use
  *
- *   - Copied verbatim from saa7134-oss's dsp_dma_start. 
+ *   - Copied verbatim from saa7134-oss's dsp_dma_start.
  *
  */
 
@@ -218,7 +218,7 @@ void saa7134_irq_alsa_done(struct saa7134_dev *dev, unsigned long status)
 
 static irqreturn_t saa7134_alsa_irq(int irq, void *dev_id, struct pt_regs *regs)
 {
-        snd_card_saa7134_t *saa7134 = dev_id;
+	snd_card_saa7134_t *saa7134 = dev_id;
 	struct saa7134_dev *dev = saa7134->saadev;
 	unsigned long report, status;
 	int loop, handled = 0;
@@ -263,18 +263,18 @@ static int snd_card_saa7134_capture_trigger(snd_pcm_substream_t * substream,
 	int err = 0;
 
 	spin_lock_irq(&dev->slock);
-        if (cmd == SNDRV_PCM_TRIGGER_START) {
+	if (cmd == SNDRV_PCM_TRIGGER_START) {
 		/* start dma */
 		saa7134_dma_start(dev);
-        } else if (cmd == SNDRV_PCM_TRIGGER_STOP) {
+	} else if (cmd == SNDRV_PCM_TRIGGER_STOP) {
 		/* stop dma */
 		saa7134_dma_stop(dev);
-        } else {
-                err = -EINVAL;
-        }
+	} else {
+		err = -EINVAL;
+	}
 	spin_unlock_irq(&dev->slock);
 
-        return err;
+	return err;
 }
 
 /*
@@ -285,7 +285,7 @@ static int snd_card_saa7134_capture_trigger(snd_pcm_substream_t * substream,
  *   Must be called during the preparation stage, before memory is
  *  allocated
  *
- *   - Copied verbatim from saa7134-oss. 
+ *   - Copied verbatim from saa7134-oss.
  *
  */
 
@@ -317,7 +317,7 @@ static int dsp_buffer_conf(struct saa7134_dev *dev, int blksize, int blocks)
  *  ALSA, but I was unable to use ALSA's own DMA, and had to force the
  *  usage of V4L's
  *
- *   - Copied verbatim from saa7134-oss. 
+ *   - Copied verbatim from saa7134-oss.
  *
  */
 
@@ -927,7 +927,7 @@ static int snd_saa7134_dev_free(snd_device_t *device)
 /*
  * ALSA initialization
  *
- *   Called by the init routine, once for each saa7134 device present, 
+ *   Called by the init routine, once for each saa7134 device present,
  *  it creates the basic structures and registers the ALSA devices
  *
  */
@@ -1021,18 +1021,18 @@ __nodev:
 
 static int saa7134_alsa_init(void)
 {
-        struct saa7134_dev *saadev = NULL;
-        struct list_head *list;
+	struct saa7134_dev *saadev = NULL;
+	struct list_head *list;
 
 	printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n");
 
-        list_for_each(list,&saa7134_devlist) {
-                saadev = list_entry(list, struct saa7134_dev, devlist);
+	list_for_each(list,&saa7134_devlist) {
+		saadev = list_entry(list, struct saa7134_dev, devlist);
 		alsa_card_saa7134_create(saadev,position);
 		position++;
-        }
+	}
 
-	if (saadev == NULL) 
+	if (saadev == NULL)
 		printk(KERN_INFO "saa7134 ALSA: no saa7134 cards found\n");
 
 	return 0;
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index ef98c85b0..841dfb314 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-08 13:10  mchehab
+
+	* ../v4l/Makefile:
+	- distclean now cleans also .orig and .rej files
+	- make update updates from CVS
+	- make snapshot now distcleans and updates.
+
+	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
 2005-11-08 00:30  rmcc
 
 	* ../linux/drivers/media/video/saa7134/saa7134-alsa.c:
diff --git a/v4l/Makefile b/v4l/Makefile
index f851674e7..2f5081b14 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -289,6 +289,8 @@ clean::
 distclean:: clean
 	-rm -f .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
 	-rm -rf .tmp_versions
+	find .. -name '*.orig' -exec rm '{}' \;
+	find .. -name '*.rej' -exec rm '{}' \;
 
 change changes changelog::
 	make -C .. changelog
@@ -296,6 +298,9 @@ change changes changelog::
 cvscommit cvs commit::
 	cd ..; cvs commit
 
+update v4l-update::
+	cd ..; cvs update
+
 .version:
 ifneq ($(KERNELRELEASE),)
 	echo -e VERSION=$(VERSION)\\nPATCHLEVEL:=$(PATCHLEVEL)\\nSUBLEVEL:=$(SUBLEVEL)\\nKERNELRELEASE:=$(KERNELRELEASE) > $(obj)/.version
@@ -317,7 +322,7 @@ tardest	?= .
 snapdir := $(HOME)/snapshot
 snap	:= $(name)
 
-snapshot snap tarball: clean
+snapshot snap tarball: update distclean
 	echo $(thisdir)
 	echo $(name)
 	echo $(date) > .snapshot