Ensoniq Soundscape patch for 2.1.80-pre5

Erik Andersen (andersee@debian.org)
Tue, 20 Jan 1998 00:40:13 -0700


Hi Linus,

The following patch allows the Ensoniq Soundscape to compile with all
the required stuff. Right now it compiles, but is missing some required
components. Anyway this fixes things for when sscape is compiled into
the kernel, and when it is compiled as a module. I also added:

# sound adapter
alias char-major-14 sscape
options sscape dma=3 irq=7 io=0x534 mpu_irq=9 mpu_io=0x330

to my /etc/conf.modules file. Patch against kernel-2.1.80-pre4 follows.
Could you please add this into 2.1.80-pre5? Thanks,

-Erik

--
Erik B. Andersen   Web:    http://www.inconnect.com/~andersen/ 
                   email:  andersee@debian.org
--This message was written using 73% post-consumer electrons--

ensoniq sscape reiquired components patch:

--- linux-2.1.80-pre4.virgin/drivers/sound/Makefile Mon Jan 19 23:42:56 1998 +++ linux/drivers/sound/Makefile Mon Jan 19 23:58:17 1998 @@ -117,22 +117,6 @@ endif endif -ifeq ($(CONFIG_MPU401),y) -LX_OBJS += mpu401.o -else - ifeq ($(CONFIG_MPU401),m) - MX_OBJS += mpu401.o - else - ifeq ($(CONFIG_MPU_EMU),y) - LX_OBJS += mpu401.o - else - ifeq ($(CONFIG_MPU_EMU),m) - MX_OBJS += mpu401.o - endif - endif - endif -endif - ifeq ($(CONFIG_UART401),y) LX_OBJS += uart401.o else @@ -159,9 +143,31 @@ ifeq ($(CONFIG_SSCAPE),y) L_OBJS += sscape.o +LX_OBJS += ad1848.o +CONFIG_MPU401 = y else ifeq ($(CONFIG_SSCAPE),m) M_OBJS += sscape.o + MX_OBJS += ad1848.o + ifneq ($(CONFIG_MPU401),y) + CONFIG_MPU401 = m + endif + endif +endif + +ifeq ($(CONFIG_MPU401),y) +LX_OBJS += mpu401.o +else + ifeq ($(CONFIG_MPU401),m) + MX_OBJS += mpu401.o + else + ifeq ($(CONFIG_MPU_EMU),y) + LX_OBJS += mpu401.o + else + ifeq ($(CONFIG_MPU_EMU),m) + MX_OBJS += mpu401.o + endif + endif endif endif