diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
| commit | efda9452046bdd707b23a85b7846ec33548f84f1 (patch) | |
| tree | f08c915049ea1829ba115cd41a0ba28ddf184e07 /sound/oss/vidc.h | |
| parent | b01f2cc1c37ac3d5ca313c90370a586dffe5aca9 (diff) | |
| parent | 36676bcbf9f6bcbea9d06e67ee8d04eacde54952 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'sound/oss/vidc.h')
| -rw-r--r-- | sound/oss/vidc.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/oss/vidc.h b/sound/oss/vidc.h index bab7044572d3..d5b8064dc565 100644 --- a/sound/oss/vidc.h +++ b/sound/oss/vidc.h | |||
| @@ -10,10 +10,6 @@ | |||
| 10 | * VIDC sound function prototypes | 10 | * VIDC sound function prototypes |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | /* vidc.c */ | ||
| 14 | |||
| 15 | extern int vidc_busy; | ||
| 16 | |||
| 17 | /* vidc_fill.S */ | 13 | /* vidc_fill.S */ |
| 18 | 14 | ||
| 19 | /* | 15 | /* |