Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/alsa-driver-build

9 files changed, 6 insertions, 66 deletions

diff --git a/.gitignore b/.gitignore
index 204b95266..db642b27a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,8 +75,6 @@ pci/ac97/ac97_bus.c
 pci/ac97/ac97_codec.c
 pci/ad1889.c
 pci/ali5451/ali5451.c
-pci/asihpi/hpidspcd.c
-pci/asihpi/hpios.c
 pci/atiixp.c
 pci/atiixp_modem.c
 pci/au88x0/au88x0.c
diff --git a/drivers/vx/vx_core.c b/drivers/vx/vx_core.c
index ccd237826..fa4aebd11 100644
--- a/drivers/vx/vx_core.c
+++ b/drivers/vx/vx_core.c
@@ -1,7 +1,4 @@
-#include "config.h"
-/* to be in alsa-driver-specfici code */
 #include <linux/version.h>
-#include "alsa-autoconf.h"
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
 #define spin_lock_bh spin_lock
 #define spin_unlock_bh spin_unlock
diff --git a/drivers/vx/vx_hwdep.c b/drivers/vx/vx_hwdep.c
index 3d7fc9238..beb4ad79c 100644
--- a/drivers/vx/vx_hwdep.c
+++ b/drivers/vx/vx_hwdep.c
@@ -1,4 +1,4 @@
-#include "alsa-autoconf.h"
+#include <linux/version.h>
 #define __NO_VERSION__
 /* to be in alsa-driver-specific code */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
diff --git a/drivers/vx/vx_pcm.c b/drivers/vx/vx_pcm.c
index f672ad998..a389feb1c 100644
--- a/drivers/vx/vx_pcm.c
+++ b/drivers/vx/vx_pcm.c
@@ -1,4 +1,4 @@
-#include "alsa-autoconf.h"
+#include <linux/version.h>
 #define __NO_VERSION__
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 2, 18)
diff --git a/pci/asihpi/Makefile b/pci/asihpi/Makefile
index 95ee4498f..50ab325b3 100644
--- a/pci/asihpi/Makefile
+++ b/pci/asihpi/Makefile
@@ -5,7 +5,6 @@ endif
 include $(SND_TOPDIR)/toplevel.config
 include $(SND_TOPDIR)/Makefile.conf
 
-clean-files := hpidspcd.c hpios.c
 
 EXTRA_CFLAGS = -I$(SND_TOPDIR)/alsa-kernel/pci/asihpi
 
@@ -13,5 +12,3 @@ include $(SND_TOPDIR)/alsa-kernel/pci/asihpi/Makefile
 
 include $(SND_TOPDIR)/Rules.make
 
-hpidspcd.c: hpidspcd.patch $(SND_TOPDIR)/alsa-kernel/pci/asihpi/hpidspcd.c
-hpios.c: hpios.patch $(SND_TOPDIR)/alsa-kernel/pci/asihpi/hpios.c
diff --git a/pci/asihpi/hpidspcd.c b/pci/asihpi/hpidspcd.c
new file mode 100644
index 000000000..9b7d80a56
--- /dev/null
+++ b/pci/asihpi/hpidspcd.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/pci/asihpi/hpidspcd.c"
diff --git a/pci/asihpi/hpidspcd.patch b/pci/asihpi/hpidspcd.patch
deleted file mode 100644
index 78316399d..000000000
--- a/pci/asihpi/hpidspcd.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../../alsa-kernel/pci/asihpi/hpidspcd.c	2010-04-21 18:36:16.613453111 +0200
-+++ hpidspcd.c	2010-04-21 18:41:26.104970371 +0200
-@@ -1,3 +1,4 @@
-+#include "adriver.h"
- /***********************************************************************/
- /*!
- 
-@@ -73,8 +74,13 @@
- 	sprintf(fw_name, "asihpi/dsp%04x.bin", adapter);
- 	HPI_DEBUG_LOG(INFO, "requesting firmware for %s\n", fw_name);
- 
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2 , 5 , 0))
-+	err = request_firmware(&ps_firmware, fw_name,
-+		ps_dsp_code->ps_dev->slot_name);
-+#else
- 	err = request_firmware(&ps_firmware, fw_name,
- 		&ps_dsp_code->ps_dev->dev);
-+#endif
- 	if (err != 0) {
- 		HPI_DEBUG_LOG(ERROR, "%d, request_firmware failed for  %s\n",
- 			err, fw_name);
diff --git a/pci/asihpi/hpios.c b/pci/asihpi/hpios.c
new file mode 100644
index 000000000..3f151a303
--- /dev/null
+++ b/pci/asihpi/hpios.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/pci/asihpi/hpios.c"
diff --git a/pci/asihpi/hpios.patch b/pci/asihpi/hpios.patch
deleted file mode 100644
index 1af0f7f50..000000000
--- a/pci/asihpi/hpios.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../../alsa-kernel/pci/asihpi/hpios.c	2010-04-21 18:36:16.617452068 +0200
-+++ hpios.c	2010-04-21 18:40:32.700700812 +0200
-@@ -1,3 +1,4 @@
-+#include "adriver.h"
- /******************************************************************************
- 
-     AudioScience HPI driver
-@@ -26,6 +27,7 @@
- #include <linux/delay.h>
- #include <linux/sched.h>
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2 , 6 , 14)
- void hpios_delay_micro_seconds(u32 num_micro_sec)
- {
- 	if ((usecs_to_jiffies(num_micro_sec) > 1) && !in_interrupt()) {
-@@ -38,6 +40,19 @@
- 		mdelay(num_micro_sec / 1000);
- 
- }
-+#else
-+void hpios_delay_micro_seconds(u32 num_micro_sec)
-+{
-+	if ((num_micro_sec / 1000 >= 1000000 / HZ) && !in_interrupt()) {
-+		set_current_state(TASK_UNINTERRUPTIBLE);
-+		schedule_timeout((HZ * num_micro_sec + (HZ - 1)) / 1000000);
-+	} else if (num_micro_sec <= 2000)
-+		udelay(num_micro_sec);
-+	else
-+		mdelay(num_micro_sec / 1000);
-+
-+}
-+#endif
- 
- void hpios_locked_mem_init(void)
- {