Commit 51544df2 authored by François Romieu's avatar François Romieu Committed by Steve French

[PATCH] Fix AD1889 driver 2.4 merge

- include/linux/wrapper.h doesn't exist in 2.5.75 and none of it's content
  is used by the driver;
- s/MINOR/minor/;
- KConfig/Makefile update.
parent 9863a172
...@@ -598,6 +598,13 @@ config SOUND_AD1816 ...@@ -598,6 +598,13 @@ config SOUND_AD1816
If you compile the driver into the kernel, you have to add If you compile the driver into the kernel, you have to add
"ad1816=<io>,<irq>,<dma>,<dma2>" to the kernel command line. "ad1816=<io>,<irq>,<dma>,<dma2>" to the kernel command line.
config SOUND_AD1889
tristate "AD1889 based cards (AD1819 codec) (EXPERIMENTAL)"
depends on EXPERIMENTAL && SOUND_OSS
help
Say M here if you have a sound card based on the Analog Devices
AD1889 chip.
config SOUND_SGALAXY config SOUND_SGALAXY
tristate "Aztech Sound Galaxy (non-PnP) cards" tristate "Aztech Sound Galaxy (non-PnP) cards"
depends on SOUND_OSS depends on SOUND_OSS
......
...@@ -33,6 +33,7 @@ obj-$(CONFIG_SOUND_VIDC) += vidc_mod.o ...@@ -33,6 +33,7 @@ obj-$(CONFIG_SOUND_VIDC) += vidc_mod.o
obj-$(CONFIG_SOUND_WAVEARTIST) += waveartist.o obj-$(CONFIG_SOUND_WAVEARTIST) += waveartist.o
obj-$(CONFIG_SOUND_SGALAXY) += sgalaxy.o ad1848.o obj-$(CONFIG_SOUND_SGALAXY) += sgalaxy.o ad1848.o
obj-$(CONFIG_SOUND_AD1816) += ad1816.o obj-$(CONFIG_SOUND_AD1816) += ad1816.o
obj-$(CONFIG_SOUND_AD1889) += ad1889.o ac97_codec.o
obj-$(CONFIG_SOUND_ACI_MIXER) += aci.o obj-$(CONFIG_SOUND_ACI_MIXER) += aci.o
obj-$(CONFIG_SOUND_AWE32_SYNTH) += awe_wave.o obj-$(CONFIG_SOUND_AWE32_SYNTH) += awe_wave.o
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <linux/soundcard.h> #include <linux/soundcard.h>
#include <linux/ac97_codec.h> #include <linux/ac97_codec.h>
#include <linux/sound.h> #include <linux/sound.h>
#include <linux/wrapper.h> #include <linux/interrupt.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/io.h> #include <asm/io.h>
...@@ -749,7 +749,7 @@ static int ad1889_ioctl(struct inode *inode, struct file *file, unsigned int cmd ...@@ -749,7 +749,7 @@ static int ad1889_ioctl(struct inode *inode, struct file *file, unsigned int cmd
static int ad1889_open(struct inode *inode, struct file *file) static int ad1889_open(struct inode *inode, struct file *file)
{ {
/* check minor; only support /dev/dsp atm */ /* check minor; only support /dev/dsp atm */
if (MINOR(inode->i_rdev) != 3) if (minor(inode->i_rdev) != 3)
return -ENXIO; return -ENXIO;
file->private_data = ad1889_dev; file->private_data = ad1889_dev;
...@@ -782,7 +782,7 @@ static struct file_operations ad1889_fops = { ...@@ -782,7 +782,7 @@ static struct file_operations ad1889_fops = {
/************************* /dev/mixer interfaces ************************ */ /************************* /dev/mixer interfaces ************************ */
static int ad1889_mixer_open(struct inode *inode, struct file *file) static int ad1889_mixer_open(struct inode *inode, struct file *file)
{ {
if (ad1889_dev->ac97_codec->dev_mixer != MINOR(inode->i_rdev)) if (ad1889_dev->ac97_codec->dev_mixer != minor(inode->i_rdev))
return -ENODEV; return -ENODEV;
file->private_data = ad1889_dev->ac97_codec; file->private_data = ad1889_dev->ac97_codec;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment