aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2008-09-07 11:24:33 -0400
committerJaroslav Kysela <perex@perex.cz>2008-09-09 03:11:53 -0400
commitde30d36be171c05dfd66fa49e3d785e004f5ecdf (patch)
tree02cf33a8a2555f0b82f7da2af9e933af6f35f036 /sound
parentd8009882e9f5e1a76986c741f071edd2ad760c97 (diff)
ALSA: fix section mismatch in the sound_core
The __exit cleanup_oss_soundcore() is called from the __init init_soundcore(). This causes section mismatch and breaks kernel's linking on sparc64. Remove the __exit attribute from the cleanup_oss_soundcore(). Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/sound_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/sound_core.c b/sound/sound_core.c
index 68614c3ed541..4ae07e236b36 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -13,7 +13,7 @@
13 13
14#ifdef CONFIG_SOUND_OSS_CORE 14#ifdef CONFIG_SOUND_OSS_CORE
15static int __init init_oss_soundcore(void); 15static int __init init_oss_soundcore(void);
16static void __exit cleanup_oss_soundcore(void); 16static void cleanup_oss_soundcore(void);
17#else 17#else
18static inline int init_oss_soundcore(void) { return 0; } 18static inline int init_oss_soundcore(void) { return 0; }
19static inline void cleanup_oss_soundcore(void) { } 19static inline void cleanup_oss_soundcore(void) { }
@@ -574,7 +574,7 @@ int soundcore_open(struct inode *inode, struct file *file)
574 574
575MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR); 575MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR);
576 576
577static void __exit cleanup_oss_soundcore(void) 577static void cleanup_oss_soundcore(void)
578{ 578{
579 /* We have nothing to really do here - we know the lists must be 579 /* We have nothing to really do here - we know the lists must be
580 empty */ 580 empty */