aboutsummaryrefslogtreecommitdiffstats
path: root/sound/sound_firmware.c
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-09-29 05:01:36 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 12:18:24 -0400
commitb9dd6ffc3d6b56417a2c4c917f51dab6470166e6 (patch)
tree629111b68c1db6de82acef3f7ab486d61751235c /sound/sound_firmware.c
parente5582ca21af82929d5cd3613321ac9233c492ebc (diff)
[PATCH] build sound/sound_firmware.c only for OSS
All sound/sound_firmware.c contains is mod_firmware_load() that is a legacy API only used by some OSS drivers. This patch builds it into an own sound_firmware module that is only built depending on CONFIG_SOUND_PRIME making the kernel slightly smaller for ALSA users. [alan@lxorguk.ukuu.org.uk: comment fix] Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/sound_firmware.c')
-rw-r--r--sound/sound_firmware.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/sound_firmware.c b/sound/sound_firmware.c
index 6ddadfac35ad..3a181d4c0dc6 100644
--- a/sound/sound_firmware.c
+++ b/sound/sound_firmware.c
@@ -4,6 +4,7 @@
4#include <linux/mm.h> 4#include <linux/mm.h>
5#include <linux/slab.h> 5#include <linux/slab.h>
6#include <asm/uaccess.h> 6#include <asm/uaccess.h>
7#include "oss/sound_firmware.h"
7 8
8static int do_mod_firmware_load(const char *fn, char **fp) 9static int do_mod_firmware_load(const char *fn, char **fp)
9{ 10{
@@ -59,8 +60,7 @@ static int do_mod_firmware_load(const char *fn, char **fp)
59 * value zero on a failure. 60 * value zero on a failure.
60 * 61 *
61 * Caution: This API is not recommended. Firmware should be loaded via 62 * Caution: This API is not recommended. Firmware should be loaded via
62 * an ioctl call and a setup application. This function may disappear 63 * request_firmware.
63 * in future.
64 */ 64 */
65 65
66int mod_firmware_load(const char *fn, char **fp) 66int mod_firmware_load(const char *fn, char **fp)
@@ -73,4 +73,6 @@ int mod_firmware_load(const char *fn, char **fp)
73 set_fs(fs); 73 set_fs(fs);
74 return r; 74 return r;
75} 75}
76EXPORT_SYMBOL(mod_firmware_load);
76 77
78MODULE_LICENSE("GPL");