Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / sound / oss / vidc.h

diff --git a/sound/oss/vidc.h b/sound/oss/vidc.h
index bab7044572d38b02572e99e3294562e9698fc9db..0d1424751ecd3d5ad4a84705f9f6768e0c591cde 100644 (file)
--- a/sound/oss/vidc.h
+++ b/sound/oss/vidc.h
@@ -10,10 +10,6 @@
  *  VIDC sound function prototypes
  */
 
-/* vidc.c */
-
-extern int vidc_busy;
-
 /* vidc_fill.S */
 
 /*
@@ -37,7 +33,7 @@ extern unsigned long vidc_fill_2x16_s(unsigned long ibuf, unsigned long iend,
  * DMA Interrupt handler
  */
 
-extern irqreturn_t vidc_sound_dma_irq(int irqnr, void *ref, struct pt_regs *regs);
+extern irqreturn_t vidc_sound_dma_irq(int irqnr, void *ref);
 
 /*
  * Filler routine pointer