diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-01 17:02:43 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-01 17:02:43 +0100 |
| commit | f4180632974fce6fa98a5fe536a7d7363415fe97 (patch) | |
| tree | e6e849a1f2840e1858c3e44695f205b9e6e4dd22 | |
| parent | f2b2249424cae89a1abb9bc6c586557820067dec (diff) | |
| download | alsa-driver-build-unstable-f4180632974fce6fa98a5fe536a7d7363415fe97.tar.gz | |
Add dummy modules to avoid conflict with old modules
All HDMI codec modules were now unified to a single module, but when
old HDMI modules are present in the kernel module directory, they are
still searched and may be loaded eventually.
For fixing this, create dummy modules so that they override the existing
non-used modules.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | pci/hda/Makefile | 9 | ||||
| -rw-r--r-- | pci/hda/dummy.c | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pci/hda/Makefile b/pci/hda/Makefile index 23dec5457..e7baf44b5 100644 --- a/pci/hda/Makefile +++ b/pci/hda/Makefile @@ -13,6 +13,15 @@ EXTRA_CFLAGS += -I$(SND_TOPDIR)/alsa-kernel/pci/hda include $(SND_TOPDIR)/alsa-kernel/pci/hda/Makefile +ifdef CONFIG_SND_HDA_CODEC_HDMI +snd-hda-codec-atihdmi-objs := dummy.o +snd-hda-codec-intelhdmi-objs := dummy.o +snd-hda-codec-nvhdmi-objs := dummy.o +obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-atihdmi.o +obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-intelhdmi.o +obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-nvhdmi.o +endif + include $(SND_TOPDIR)/Rules.make hda_intel.c: hda_intel.patch $(SND_TOPDIR)/alsa-kernel/pci/hda/hda_intel.c diff --git a/pci/hda/dummy.c b/pci/hda/dummy.c new file mode 100644 index 000000000..a33f83aec --- /dev/null +++ b/pci/hda/dummy.c @@ -0,0 +1,9 @@ +#include <linux/init.h> +#include <linux/module.h> + +static int __init dummy_init(void) +{ + return -EINVAL; +} + +module_init(dummy_init) |