[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.

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index d50c635f8e4e851240bd87872268288fc72f1f3f..1ae2c778a7aea2318896669bc7a64d1b4b718b19 100644 (file)
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -598,6 +598,13 @@ config SOUND_AD1816
          If you compile the driver into the kernel, you have to add
          "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
        tristate "Aztech Sound Galaxy (non-PnP) cards"
        depends on SOUND_OSS

diff --git a/sound/oss/Makefile b/sound/oss/Makefile
index f107c75a035d1aba18f632d61344c362e5b38ee5..e96098f7e8b4f03b5e28aa29e2d0f15587d86b49 100644 (file)
--- a/sound/oss/Makefile
+++ b/sound/oss/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_SOUND_VIDC)      += vidc_mod.o
 obj-$(CONFIG_SOUND_WAVEARTIST) += waveartist.o
 obj-$(CONFIG_SOUND_SGALAXY)    += sgalaxy.o ad1848.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_AWE32_SYNTH)        += awe_wave.o
 

diff --git a/sound/oss/ad1889.c b/sound/oss/ad1889.c
index 54afcb16d47e12044bcf911592669ac40cd1f46b..a55ade032da647a043a0b7b3793d277d70d83a59 100644 (file)
--- a/sound/oss/ad1889.c
+++ b/sound/oss/ad1889.c
@@ -37,7 +37,7 @@
 #include <linux/soundcard.h>
 #include <linux/ac97_codec.h>
 #include <linux/sound.h>
-#include <linux/wrapper.h>
+#include <linux/interrupt.h>
 
 #include <asm/delay.h>
 #include <asm/io.h>
@@ -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)
 {
        /* check minor; only support /dev/dsp atm */
-       if (MINOR(inode->i_rdev) != 3)
+       if (minor(inode->i_rdev) != 3)
                return -ENXIO;
        
        file->private_data = ad1889_dev;
@@ -782,7 +782,7 @@ static struct file_operations ad1889_fops = {
 /************************* /dev/mixer interfaces ************************ */
 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;
 
        file->private_data = ad1889_dev->ac97_codec;