aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/line6/capture.h
diff options
context:
space:
mode:
authorMarkus Grabner <grabner@icg.tugraz.at>2010-08-22 19:08:25 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-31 18:28:16 -0400
commite1a164d7a3e05aae15eb603ee8f1b77446480a3b (patch)
tree829d6ed586e9fe3680be24faab8c61d5c596443e /drivers/staging/line6/capture.h
parent1027f476f507ef7ed9919cd3e3d32310f3985da1 (diff)
Staging: line6: another upstream sync
Everything should be in sync now. Signed-off-by: Markus Grabner <grabner@icg.tugraz.at> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/line6/capture.h')
-rw-r--r--drivers/staging/line6/capture.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/line6/capture.h b/drivers/staging/line6/capture.h
index c9ea063c829..a7509fbbb95 100644
--- a/drivers/staging/line6/capture.h
+++ b/drivers/staging/line6/capture.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Line6 Linux USB driver - 0.9.0 2 * Line6 Linux USB driver - 0.9.1beta
3 * 3 *
4 * Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) 4 * Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at)
5 * 5 *
@@ -12,17 +12,17 @@
12#ifndef CAPTURE_H 12#ifndef CAPTURE_H
13#define CAPTURE_H 13#define CAPTURE_H
14 14
15
16#include <sound/pcm.h> 15#include <sound/pcm.h>
17 16
18#include "driver.h" 17#include "driver.h"
19#include "pcm.h" 18#include "pcm.h"
20 19
21
22extern struct snd_pcm_ops snd_line6_capture_ops; 20extern struct snd_pcm_ops snd_line6_capture_ops;
23 21
24extern void line6_capture_copy(struct snd_line6_pcm *line6pcm, char *fbuf, 22extern void line6_capture_copy(struct snd_line6_pcm *line6pcm, char *fbuf,
25 int fsize); 23 int fsize);
24extern void line6_capture_check_period(struct snd_line6_pcm *line6pcm,
25 int length);
26extern int line6_create_audio_in_urbs(struct snd_line6_pcm *line6pcm); 26extern int line6_create_audio_in_urbs(struct snd_line6_pcm *line6pcm);
27extern int line6_submit_audio_in_all_urbs(struct snd_line6_pcm *line6pcm); 27extern int line6_submit_audio_in_all_urbs(struct snd_line6_pcm *line6pcm);
28extern void line6_unlink_audio_in_urbs(struct snd_line6_pcm *line6pcm); 28extern void line6_unlink_audio_in_urbs(struct snd_line6_pcm *line6pcm);