summaryrefslogtreecommitdiffstats
path: root/drivers/sound/lowlevel
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-06-03 07:28:06 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-06-03 07:28:06 +0000
commitedb5c61526e98426a5f3da889463c2b8d85d04c0 (patch)
tree27965970d5fe47655e451ef3251cc20df75e04b7 /drivers/sound/lowlevel
parent2e6827eb279d02923bf12eb0cfc077b26f545953 (diff)
Sync with Linux 2.1.41
Diffstat (limited to 'drivers/sound/lowlevel')
-rw-r--r--drivers/sound/lowlevel/Config.tmpl2
-rw-r--r--drivers/sound/lowlevel/aci.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/sound/lowlevel/Config.tmpl b/drivers/sound/lowlevel/Config.tmpl
index ff107a819..a3864b96f 100644
--- a/drivers/sound/lowlevel/Config.tmpl
+++ b/drivers/sound/lowlevel/Config.tmpl
@@ -32,7 +32,7 @@ if [ "$CONFIG_LOWLEVEL_SOUND" = "y" ]; then
fi
fi
- if [ "$CONFIG_MIDI" = "y" ]; then
+ if [ "$CONFIG_MPU401" = "y" ]; then
bool 'Audio Excel DSP 16 (MPU401 emulation)' CONFIG_AEDSP16_MPU401
if [ "$CONFIG_AEDSP16_MPU401" = "y" ]; then
comment 'Audio Excel DSP 16 [MPU-401]'
diff --git a/drivers/sound/lowlevel/aci.c b/drivers/sound/lowlevel/aci.c
index 657fa697d..7599d5a6c 100644
--- a/drivers/sound/lowlevel/aci.c
+++ b/drivers/sound/lowlevel/aci.c
@@ -22,9 +22,9 @@
* First version written.
* 1995-12-31 Markus Kuhn
* Second revision, general code cleanup.
- * 1997-05-16 Hannu Savolainen
+ * 1996-05-16 Hannu Savolainen
* Integrated with other parts of the driver.
- * 1997-05-28 Markus Kuhn
+ * 1996-05-28 Markus Kuhn
* Initialize CS4231A mixer, make ACI first mixer,
* use new private mixer API for solo mode.
*/