--- linux-2.4.22-02/sound/Config.in.orig	2003-08-12 16:28:37.000000000 +0200
+++ linux-2.4.22-02/sound/Config.in	2003-08-12 16:30:15.000000000 +0200
@@ -22,6 +22,9 @@
 if [ "$CONFIG_SND" != "n" -a "$CONFIG_ARM" = "y" ]; then
   source sound/arm/Config.in
 fi
+if [ "$CONFIG_SND" != "n" ]; then
+  source sound/pcmcia/Config.in
+fi
 # the following will depenend on the order of config.
 # here assuming USB is defined before ALSA
 #if [ "$CONFIG_SND" != "n" -a "$CONFIG_USB" != "n" ]; then

diff -Naurb linux-2.4.22-02/sound/pcmcia.old/Config.in linux-2.4.22-02/sound/pcmcia/Config.in
--- linux-2.4.22-02/sound/pcmcia.old/Config.in	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.22-02/sound/pcmcia/Config.in	2003-08-12 15:28:57.000000000 +0200
@@ -0,0 +1,9 @@
+# ALSA PCMCIA drivers
+
+mainmenu_option next_comment
+comment 'ALSA PCMCIA devices'
+
+dep_tristate 'Digigram VX-pocket driver' CONFIG_SND_VXPOCKET $CONFIG_SND $CONFIG_PCMCIA
+dep_tristate 'Digigram VX-pocket 440 driver' CONFIG_SND_VXP440 $CONFIG_SND $CONFIG_PCMCIA
+
+endmenu
diff -Naurb linux-2.4.22-02/sound/pcmcia.old/Kconfig linux-2.4.22-02/sound/pcmcia/Kconfig
--- linux-2.4.22-02/sound/pcmcia.old/Kconfig	2003-05-23 18:00:45.000000000 +0200
+++ linux-2.4.22-02/sound/pcmcia/Kconfig	1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-# ALSA PCMCIA drivers
-
-menu "PCMCIA devices"
-	depends on SND!=n && PCMCIA
-
-config SND_VXPOCKET
-	tristate "Digigram VXpocket"
-	depends on SND && PCMCIA
-	help
-	  Say 'Y' or 'M' to include support for Digigram VXpocket soundcard.
-
-config SND_VXP440
-	tristate "Digigram VXpocket 440"
-	depends on SND && PCMCIA
-	help
-	  Say 'Y' or 'M' to include support for Digigram VXpocket 440 soundcard.
-
-endmenu
diff -Naurb linux-2.4.22-02/sound/pcmcia.old/Makefile linux-2.4.22-02/sound/pcmcia/Makefile
--- linux-2.4.22-02/sound/pcmcia.old/Makefile	2003-08-11 21:32:07.000000000 +0200
+++ linux-2.4.22-02/sound/pcmcia/Makefile	2003-08-12 15:28:57.000000000 +0200
@@ -5,16 +5,9 @@
 
 O_TARGET	:= _pcmcia.o
 
-_subdirs := vx
-
-subdir-$(CONFIG_SND) += $(_subdirs)
-
+subdir-$(CONFIG_SND) += vx
 ifeq ($(CONFIG_SND),y)
-  subdir-m += $(_subdirs)
   obj-y += vx/_vx.o
 endif
 
 include $(TOPDIR)/Rules.make
-
-
-
diff -Naurb linux-2.4.22-02/sound/pcmcia.old/vx/Makefile linux-2.4.22-02/sound/pcmcia/vx/Makefile
--- linux-2.4.22-02/sound/pcmcia.old/vx/Makefile	2003-08-11 21:32:07.000000000 +0200
+++ linux-2.4.22-02/sound/pcmcia/vx/Makefile	2003-08-12 15:28:57.000000000 +0200
@@ -3,11 +3,11 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
 #
 
-O_TARGET = _vx.o
+O_TARGET     := _vx.o
 
-list_multi	:= snd-vx-cs.o
+list-multi   := snd-vx-cs-objs.o snd-vxpocket.o snd-vxp440.o
 
-export-objs += vx_entry.o
+export-objs  := vx_entry.o
 
 snd-vx-cs-objs := vx_entry.o vxp_ops.o vxp_mixer.o
 snd-vxpocket-objs := vxpocket.o
@@ -18,11 +18,12 @@
 
 include $(TOPDIR)/Rules.make
 
-snd-vx-cs.o: $(snd-vx-cs-objs)
-	$(LD) $(LD_RFLAG) -r -o $@ $(snd-vx-cs-objs)
-
 snd-vxpocket.o: $(snd-vxpocket-objs)
 	$(LD) $(LD_RFLAG) -r -o $@ $(snd-vxpocket-objs)
 
 snd-vxp440.o: $(snd-vxp440-objs)
 	$(LD) $(LD_RFLAG) -r -o $@ $(snd-vxp440-objs)
+
+snd-vx-cs.o: $(snd-vx-cs-objs)
+	$(LD) $(LD_RFLAG) -r -o $@ $(snd-vx-cs-objs)
+