aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 14:15:23 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 14:15:23 -0500
commit3f00d3e8fb963968a922d821a9a53b503b687e81 (patch)
treedfac1c73ae63f8d48340f3bbb77ee53b322c59e9 /sound/oss
parent407cf84f956ee4b52da5508d5357b8ae212ff77c (diff)
parenta637a114f36b94a1ad8b9867f43bac0414958420 (diff)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/au1000.c6
-rw-r--r--sound/oss/nec_vrc5477.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sound/oss/au1000.c b/sound/oss/au1000.c
index 2c2ae2ee01ac..c407de86cbb6 100644
--- a/sound/oss/au1000.c
+++ b/sound/oss/au1000.c
@@ -563,7 +563,7 @@ static void start_adc(struct au1000_state *s)
563#define DMABUF_DEFAULTORDER (17-PAGE_SHIFT) 563#define DMABUF_DEFAULTORDER (17-PAGE_SHIFT)
564#define DMABUF_MINORDER 1 564#define DMABUF_MINORDER 1
565 565
566extern inline void dealloc_dmabuf(struct au1000_state *s, struct dmabuf *db) 566static inline void dealloc_dmabuf(struct au1000_state *s, struct dmabuf *db)
567{ 567{
568 struct page *page, *pend; 568 struct page *page, *pend;
569 569
@@ -667,14 +667,14 @@ static int prog_dmabuf(struct au1000_state *s, struct dmabuf *db)
667 return 0; 667 return 0;
668} 668}
669 669
670extern inline int prog_dmabuf_adc(struct au1000_state *s) 670static inline int prog_dmabuf_adc(struct au1000_state *s)
671{ 671{
672 stop_adc(s); 672 stop_adc(s);
673 return prog_dmabuf(s, &s->dma_adc); 673 return prog_dmabuf(s, &s->dma_adc);
674 674
675} 675}
676 676
677extern inline int prog_dmabuf_dac(struct au1000_state *s) 677static inline int prog_dmabuf_dac(struct au1000_state *s)
678{ 678{
679 stop_dac(s); 679 stop_dac(s);
680 return prog_dmabuf(s, &s->dma_dac); 680 return prog_dmabuf(s, &s->dma_dac);
diff --git a/sound/oss/nec_vrc5477.c b/sound/oss/nec_vrc5477.c
index 0481e5e54ddf..9ac4bf7e1e89 100644
--- a/sound/oss/nec_vrc5477.c
+++ b/sound/oss/nec_vrc5477.c
@@ -435,7 +435,7 @@ static int ac97_codec_not_present(struct ac97_codec *codec)
435 435
436/* --------------------------------------------------------------------- */ 436/* --------------------------------------------------------------------- */
437 437
438extern inline void 438static inline void
439stop_dac(struct vrc5477_ac97_state *s) 439stop_dac(struct vrc5477_ac97_state *s)
440{ 440{
441 struct dmabuf* db = &s->dma_dac; 441 struct dmabuf* db = &s->dma_dac;
@@ -553,7 +553,7 @@ static void start_dac(struct vrc5477_ac97_state *s)
553 spin_unlock_irqrestore(&s->lock, flags); 553 spin_unlock_irqrestore(&s->lock, flags);
554} 554}
555 555
556extern inline void stop_adc(struct vrc5477_ac97_state *s) 556static inline void stop_adc(struct vrc5477_ac97_state *s)
557{ 557{
558 struct dmabuf* db = &s->dma_adc; 558 struct dmabuf* db = &s->dma_adc;
559 unsigned long flags; 559 unsigned long flags;
@@ -652,7 +652,7 @@ static void start_adc(struct vrc5477_ac97_state *s)
652#define DMABUF_DEFAULTORDER (16-PAGE_SHIFT) 652#define DMABUF_DEFAULTORDER (16-PAGE_SHIFT)
653#define DMABUF_MINORDER 1 653#define DMABUF_MINORDER 1
654 654
655extern inline void dealloc_dmabuf(struct vrc5477_ac97_state *s, 655static inline void dealloc_dmabuf(struct vrc5477_ac97_state *s,
656 struct dmabuf *db) 656 struct dmabuf *db)
657{ 657{
658 if (db->lbuf) { 658 if (db->lbuf) {