aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/soundcard.c
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-10-04 05:17:31 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 10:55:32 -0400
commitece7f77b86e53bfe14699fdbcb0f03fdad0a01d6 (patch)
tree7ec7687dadcd6e45d75c8251257eaadae00f6273 /sound/oss/soundcard.c
parentd56b9b9c464a10ab1ee51a4c6190a2b57b8ef7a6 (diff)
[PATCH] kill sound/oss/*_syms.c
Move all EXPORT_SYMBOL's from sound/oss/*_syms.c to the files with the actual functions. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss/soundcard.c')
-rw-r--r--sound/oss/soundcard.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index 683dc00a8d2b..2344d09c7114 100644
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -107,6 +107,7 @@ int *load_mixer_volumes(char *name, int *levels, int present)
107 mixer_vols[n].levels[i] = levels[i]; 107 mixer_vols[n].levels[i] = levels[i];
108 return mixer_vols[n].levels; 108 return mixer_vols[n].levels;
109} 109}
110EXPORT_SYMBOL(load_mixer_volumes);
110 111
111static int set_mixer_levels(void __user * arg) 112static int set_mixer_levels(void __user * arg)
112{ 113{
@@ -541,12 +542,6 @@ static int __init oss_init(void)
541 int err; 542 int err;
542 int i, j; 543 int i, j;
543 544
544 /* drag in sound_syms.o */
545 {
546 extern char sound_syms_symbol;
547 sound_syms_symbol = 0;
548 }
549
550#ifdef CONFIG_PCI 545#ifdef CONFIG_PCI
551 if(dmabug) 546 if(dmabug)
552 isa_dma_bridge_buggy = dmabug; 547 isa_dma_bridge_buggy = dmabug;
@@ -614,6 +609,8 @@ static void __exit oss_cleanup(void)
614module_init(oss_init); 609module_init(oss_init);
615module_exit(oss_cleanup); 610module_exit(oss_cleanup);
616MODULE_LICENSE("GPL"); 611MODULE_LICENSE("GPL");
612MODULE_DESCRIPTION("OSS Sound subsystem");
613MODULE_AUTHOR("Hannu Savolainen, et al.");
617 614
618 615
619int sound_alloc_dma(int chn, char *deviceID) 616int sound_alloc_dma(int chn, char *deviceID)
@@ -627,6 +624,7 @@ int sound_alloc_dma(int chn, char *deviceID)
627 624
628 return 0; 625 return 0;
629} 626}
627EXPORT_SYMBOL(sound_alloc_dma);
630 628
631int sound_open_dma(int chn, char *deviceID) 629int sound_open_dma(int chn, char *deviceID)
632{ 630{
@@ -642,6 +640,7 @@ int sound_open_dma(int chn, char *deviceID)
642 dma_alloc_map[chn] = DMA_MAP_BUSY; 640 dma_alloc_map[chn] = DMA_MAP_BUSY;
643 return 0; 641 return 0;
644} 642}
643EXPORT_SYMBOL(sound_open_dma);
645 644
646void sound_free_dma(int chn) 645void sound_free_dma(int chn)
647{ 646{
@@ -652,6 +651,7 @@ void sound_free_dma(int chn)
652 free_dma(chn); 651 free_dma(chn);
653 dma_alloc_map[chn] = DMA_MAP_UNAVAIL; 652 dma_alloc_map[chn] = DMA_MAP_UNAVAIL;
654} 653}
654EXPORT_SYMBOL(sound_free_dma);
655 655
656void sound_close_dma(int chn) 656void sound_close_dma(int chn)
657{ 657{
@@ -661,6 +661,7 @@ void sound_close_dma(int chn)
661 } 661 }
662 dma_alloc_map[chn] = DMA_MAP_FREE; 662 dma_alloc_map[chn] = DMA_MAP_FREE;
663} 663}
664EXPORT_SYMBOL(sound_close_dma);
664 665
665static void do_sequencer_timer(unsigned long dummy) 666static void do_sequencer_timer(unsigned long dummy)
666{ 667{
@@ -714,6 +715,7 @@ void conf_printf(char *name, struct address_info *hw_config)
714 printk("\n"); 715 printk("\n");
715#endif 716#endif
716} 717}
718EXPORT_SYMBOL(conf_printf);
717 719
718void conf_printf2(char *name, int base, int irq, int dma, int dma2) 720void conf_printf2(char *name, int base, int irq, int dma, int dma2)
719{ 721{
@@ -734,3 +736,5 @@ void conf_printf2(char *name, int base, int irq, int dma, int dma2)
734 printk("\n"); 736 printk("\n");
735#endif 737#endif
736} 738}
739EXPORT_SYMBOL(conf_printf2);
740