diff -Nru emu10k1-clean/Makefile emu10k1-2.5/Makefile
--- emu10k1-clean/Makefile	Mon Feb 25 09:33:20 2002
+++ emu10k1-2.5/Makefile	Sun May 12 16:08:41 2002
@@ -43,6 +43,12 @@
   ifeq ($(KERNEL_RELEASE),2.4)
     KERNEL_EXTRA_INCLUDES := -I2.4/
     MODULE_PATH := /lib/modules/$(KERNEL_VERSION)/kernel/drivers/sound/emu10k1
+    AC97_MODULE_PATH := /lib/modules/$(KERNEL_VERSION)/kernel/drivers/sound   
+    EMU10K1_OBJS += 2.4/emu_wrapper.o
+  endif 
+  ifeq ($(KERNEL_RELEASE),2.5)
+    KERNEL_EXTRA_INCLUDES := -I2.4/
+    MODULE_PATH := /lib/modules/$(KERNEL_VERSION)/kernel/drivers/sound/emu10k1
     AC97_MODULE_PATH := /lib/modules/$(KERNEL_VERSION)/kernel/drivers/sound
     EMU10K1_OBJS += 2.4/emu_wrapper.o
   endif 
diff -Nru emu10k1-clean/audio.c emu10k1-2.5/audio.c
--- emu10k1-clean/audio.c	Wed Mar 13 01:50:41 2002
+++ emu10k1-2.5/audio.c	Sun May 12 16:15:46 2002
@@ -1194,7 +1194,7 @@
 
 static int emu10k1_audio_open(struct inode *inode, struct file *file)
 {
-	int minor = MINOR(inode->i_rdev);
+  int minor = minor(inode->i_rdev);
 	struct emu10k1_card *card = NULL;
 	struct list_head *entry;
 	struct emu10k1_wavedevice *wave_dev;
diff -Nru emu10k1-clean/midi.c emu10k1-2.5/midi.c
--- emu10k1-clean/midi.c	Mon Jan 14 13:17:41 2002
+++ emu10k1-2.5/midi.c	Sun May 12 16:16:14 2002
@@ -88,7 +88,7 @@
 
 static int emu10k1_midi_open(struct inode *inode, struct file *file)
 {
-	int minor = MINOR(inode->i_rdev);
+	int minor = minor(inode->i_rdev);
 	struct emu10k1_card *card = NULL;
 	struct emu10k1_mididevice *midi_dev;
 	struct list_head *entry;
diff -Nru emu10k1-clean/mixer.c emu10k1-2.5/mixer.c
--- emu10k1-clean/mixer.c	Sun Mar 17 23:28:51 2002
+++ emu10k1-2.5/mixer.c	Sun May 12 16:16:39 2002
@@ -664,7 +664,7 @@
 
 static int emu10k1_mixer_open(struct inode *inode, struct file *file)
 {
-	int minor = MINOR(inode->i_rdev);
+	int minor = minor(inode->i_rdev);
 	struct emu10k1_card *card = NULL;
 	struct list_head *entry;