[PATCH] Re: PATCH: Merge AD1889 driver from 2.4

[Francois Romieu]

The following patch may help:

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

 sound/oss/Kconfig  |    7 +++++++
 sound/oss/Makefile |    1 +
 sound/oss/ad1889.c |    6 +++---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff -puN sound/oss/ad1889.c~ahum-merge-ad1889 sound/oss/ad1889.c
--- linux-2.5.75-20030711_0808/sound/oss/ad1889.c~ahum-merge-ad1889	Sat Jul 12 00:40:26 2003
+++ linux-2.5.75-20030711_0808-fr/sound/oss/ad1889.c	Sat Jul 12 00:40:26 2003
@@ -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 *in
 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_fop
 /************************* /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;
diff -puN sound/oss/Kconfig~ahum-merge-ad1889 sound/oss/Kconfig
--- linux-2.5.75-20030711_0808/sound/oss/Kconfig~ahum-merge-ad1889	Sat Jul 12 00:40:26 2003
+++ linux-2.5.75-20030711_0808-fr/sound/oss/Kconfig	Sat Jul 12 00:40:26 2003
@@ -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 -puN sound/oss/Makefile~ahum-merge-ad1889 sound/oss/Makefile
--- linux-2.5.75-20030711_0808/sound/oss/Makefile~ahum-merge-ad1889	Sat Jul 12 00:40:26 2003
+++ linux-2.5.75-20030711_0808-fr/sound/oss/Makefile	Sat Jul 12 00:40:26 2003
@@ -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
 

_