diff options
| -rw-r--r-- | mk/modules.mk | 6 | ||||
| -rw-r--r-- | package/Depends.mk | 1 | ||||
| -rw-r--r-- | package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c | 17 | ||||
| -rw-r--r-- | target/linux/config/Config.in.multimedia | 8 |
4 files changed, 31 insertions, 1 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 1d401c169..7f85c6f9f 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -930,6 +930,7 @@ $(eval $(call KMOD_template,SND,sound-alsa,\ $(MODULES_DIR)/kernel/sound/core/snd \ $(MODULES_DIR)/kernel/sound/core/snd-timer \ $(MODULES_DIR)/kernel/sound/core/snd-pcm \ + $(MODULES_DIR)/kernel/sound/core/snd-rawmidi \ ,40)) $(eval $(call KMOD_template,SND_OSSEMUL,sound-alsa-oss-emul,\ @@ -943,11 +944,14 @@ $(eval $(call KMOD_template,SND_AC97_CODEC,sound-alsa-ac97-codec,\ ,50)) $(eval $(call KMOD_template,SND_VIA82XX,sound-alsa-via82xx,\ - $(MODULES_DIR)/kernel/sound/core/snd-rawmidi \ $(MODULES_DIR)/kernel/sound/drivers/mpu401/snd-mpu401-uart \ $(MODULES_DIR)/kernel/sound/pci/snd-via82xx \ ,55)) +$(eval $(call KMOD_template,SND_ENS1370,sound-alsa-ens1370,\ + $(MODULES_DIR)/kernel/sound/pci/snd-ens1370 \ +,55)) + $(eval $(call KMOD_template,SND_CS5535AUDIO,sound-alsa-cs5535,\ $(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \ ,55)) diff --git a/package/Depends.mk b/package/Depends.mk index ba58a9e07..8ccdb3b0d 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -262,6 +262,7 @@ xfsprogs-compile: e2fsprogs-compile libXxf86dga-compile: xf86dgaproto-compile libXext-compile libXaw-compile xkeyboard-config-compile: xkbcomp-compile xf86-video-geode-compile: xorg-server-compile +xf86-video-cirrus-compile: xorg-server-compile xf86dga-compile: libXxf86dga-compile xorg-server-compile: libX11-compile randrproto-compile renderproto-compile fixesproto-compile \ damageproto-compile scrnsaverproto-compile resourceproto-compile \ diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c b/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c new file mode 100644 index 000000000..411d7b2e2 --- /dev/null +++ b/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c @@ -0,0 +1,17 @@ +--- xorg-server-1.7.1.orig/hw/xfree86/common/xf86VGAarbiter.c 2009-10-09 06:08:28.000000000 +0200 ++++ xorg-server-1.7.1/hw/xfree86/common/xf86VGAarbiter.c 2009-12-10 17:14:01.000000000 +0100 +@@ -38,14 +38,8 @@ + #include "xf86Priv.h" + #include "pciaccess.h" + +-#ifdef DEBUG +-#error "no, really, you dont want to do this" +-#define DPRINT_S(x,y) ErrorF(x ": %i\n",y); +-#define DPRINT(x) ErrorF(x "\n"); +-#else + #define DPRINT_S(x,y) + #define DPRINT(x) +-#endif + + static GCFuncs VGAarbiterGCFuncs = { + VGAarbiterValidateGC, VGAarbiterChangeGC, VGAarbiterCopyGC, diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia index d485d31ec..30e6aa293 100644 --- a/target/linux/config/Config.in.multimedia +++ b/target/linux/config/Config.in.multimedia @@ -64,6 +64,14 @@ config ADK_KPACKAGE_KMOD_SND_VIA82XX help ALSA VIA82XX driver +config ADK_KPACKAGE_KMOD_SND_ENS1370 + prompt "kmod-sound-alsa-ens1370........ ALSA Ensoniq 1370 driver" + depends on ADK_KPACKAGE_KMOD_SND + tristate + default n + help + ALSA Ensonique 1370 driver + config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO prompt "kmod-sound-alsa-cs5535......... ALSA AMD CS5535 driver (ALIX1C)" depends on ADK_KPACKAGE_KMOD_SND |