small fixup for drivers/sbus/audio/Makefile

Albert Cranford (AlbertC@millennium.net)
Sun, 22 Feb 1998 18:29:25 -0500

Hello Linus,
Could you please apply the following small patch to the next release?
My problem with the old names is that sbus/audio/audio.o always gets
compiled and put into
the misc modules group. I don't even have sbus configured.
I found the problem to be from the ifdef M and ifdef MM stuff.
The patch changes the name and now the problem goes away. Also I think
sbus audio will still
work properly.
Thanks,
Albert

--- linux-2.1.88/drivers/sbus/audio/Makefile.orig Sun Feb 22
17:43:22 1998
+++ linux/drivers/sbus/audio/Makefile Sun Feb 22 17:43:27 1998
@@ -16,37 +16,37 @@
M_OBJS :=

ifeq ($(CONFIG_SPARCAUDIO),y)
-M=y
+SBUS_AUDIO=y
else
ifeq ($(CONFIG_SPARCAUDIO),m)
- MM=y
+ SBUS_AUDIO_MODULE=y
endif
endif

ifeq ($(CONFIG_SPARCAUDIO_AMD7930),y)
-M=y
+SBUS_AUDIO=y
OX_OBJS += amd7930.o
else
ifeq ($(CONFIG_SPARCAUDIO_AMD7930),m)
- MM=y
+ SBUS_AUDIO_MODULE=y
MX_OBJS += amd7930.o
endif
endif

ifeq ($(CONFIG_SPARCAUDIO_CS4231),y)
-M=y
+SBUS_AUDIO=y
O_OBJS += cs4231.o
else
ifeq ($(CONFIG_SPARCAUDIO_CS4231),m)
- MM=y
+ SBUS_AUDIO_MODULE=y
M_OBJS += cs4231.o
endif
endif

-ifdef M
+ifdef SBUS_AUDIO
OX_OBJS += audio.o
else
- ifdef MM
+ ifdef SBUS_AUDIO_MODULE
MX_OBJS += audio.o
endif
end

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu