diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:03:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:03:34 -0400 |
| commit | 75a95178dafb5c8d69b4abe45ea746a9cea23142 (patch) | |
| tree | 1dbf80c83d9521dcdebc9e670f48da6c1ba34187 /sound/oss/vidc.h | |
| parent | 8531c5ffbca65f6df868637c26e6df6f88bff738 (diff) | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff) | |
Merge upstream into 'upstream' branch of netdev-2.6.git.
Hand fix merge conflict in drivers/net/tokenring/Kconfig.
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 | /* |