The patch titled
build sound/sound_firmware.c only for OSS
has been removed from the -mm tree. Its filename is
build-sound-sound_firmwarec-only-for-oss.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: build sound/sound_firmware.c only for OSS
From: Adrian Bunk <bunk@xxxxxxxxx>
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@xxxxxxxxxxxxxxxxxxx: comment fix]
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Acked-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
sound/Makefile | 3 ++-
sound/sound_core.c | 4 ----
sound/sound_firmware.c | 6 ++++--
3 files changed, 6 insertions(+), 7 deletions(-)
diff -puN sound/Makefile~build-sound-sound_firmwarec-only-for-oss sound/Makefile
--- a/sound/Makefile~build-sound-sound_firmwarec-only-for-oss
+++ a/sound/Makefile
@@ -2,6 +2,7 @@
#
obj-$(CONFIG_SOUND) += soundcore.o
+obj-$(CONFIG_SOUND_PRIME) += sound_firmware.o
obj-$(CONFIG_SOUND_PRIME) += oss/
obj-$(CONFIG_DMASOUND) += oss/
obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/
@@ -11,4 +12,4 @@ ifeq ($(CONFIG_SND),y)
obj-y += last.o
endif
-soundcore-objs := sound_core.o sound_firmware.o
+soundcore-objs := sound_core.o
diff -puN sound/sound_core.c~build-sound-sound_firmwarec-only-for-oss sound/sound_core.c
--- a/sound/sound_core.c~build-sound-sound_firmwarec-only-for-oss
+++ a/sound/sound_core.c
@@ -551,10 +551,6 @@ int soundcore_open(struct inode *inode,
return -ENODEV;
}
-extern int mod_firmware_load(const char *, char **);
-EXPORT_SYMBOL(mod_firmware_load);
-
-
MODULE_DESCRIPTION("Core sound module");
MODULE_AUTHOR("Alan Cox");
MODULE_LICENSE("GPL");
diff -puN sound/sound_firmware.c~build-sound-sound_firmwarec-only-for-oss sound/sound_firmware.c
--- a/sound/sound_firmware.c~build-sound-sound_firmwarec-only-for-oss
+++ a/sound/sound_firmware.c
@@ -4,6 +4,7 @@
#include <linux/mm.h>
#include <linux/slab.h>
#include <asm/uaccess.h>
+#include "oss/sound_firmware.h"
static int do_mod_firmware_load(const char *fn, char **fp)
{
@@ -59,8 +60,7 @@ static int do_mod_firmware_load(const ch
* value zero on a failure.
*
* Caution: This API is not recommended. Firmware should be loaded via
- * an ioctl call and a setup application. This function may disappear
- * in future.
+ * request_firmware.
*/
int mod_firmware_load(const char *fn, char **fp)
@@ -73,4 +73,6 @@ int mod_firmware_load(const char *fn, ch
set_fs(fs);
return r;
}
+EXPORT_SYMBOL(mod_firmware_load);
+MODULE_LICENSE("GPL");
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
git-drm.patch
git-dvb.patch
git-gfs2.patch
git-ieee1394.patch
git-input.patch
git-pcmcia.patch
drivers-net-pcmcia-xirc2ps_csc-remove-unused-label.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
drivers-scsi-advansysc-cleanups.patch
make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
git-cryptodev.patch
acx1xx-wireless-driver.patch
drivers-edac-make-code-static.patch
kernel-time-ntpc-possible-cleanups.patch
generic-ioremap_page_range-implementation-fix.patch
generic-ioremap_page_range-i386-conversion-fix.patch
fs-ecryptfs-possible-cleanups.patch
ecryptfs-add-a-maintainers-entry.patch
make-kernel-sysctlc_proc_do_string-static.patch
namespaces-utsname-sysctl-hack.patch
namespaces-utsname-implement-clone_newuts-flag.patch
rename-the-provided-execve-functions-to-kernel_execve-fixes.patch
provide-kernel_execve-on-all-architectures-m68knommu-fix.patch
fs-reiser4-possible-cleanups.patch
reiser4-possible-cleanups-2.patch
drivers-ide-cleanups.patch
atyfb-possible-cleanups.patch
fbcon-make-3-functions-static.patch
vt-proper-prototypes-for-some-console-functions.patch
md-the-scheduled-removal-of-the-start_array-ioctl-for-md.patch
srcu-3-add-srcu-operations-to-rcutorture-fix.patch
rcu-add-fake-writers-to-rcutorture-tidy.patch
the-scheduled-removal-of-some-oss-drivers.patch
the-scheduled-removal-of-some-oss-drivers-fix.patch
the-scheduled-removal-of-some-oss-drivers-fix-fix.patch
kill-sound-oss-_symsc.patch
slab-cache-shrinker-statistics.patch
debug-shared-irqs-kconfig-fix.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
