[alsa-devel] alsa-driver: compilation fails

[pl bossart]

Somehow I pulled the latest and greatest code alsa-kmirror and
alsa-driver, and the compilation now fails. ./gitcompile yells about a
problematic patch on pcm_native.c.
Any idea on how to refresh this patch ?
Thanks,
-Pierre


copying file alsa-kernel/core/pcm_native.c
patching file pcm_native.c
Hunk #2 FAILED at 22.
Hunk #3 succeeded at 370 (offset -1 lines).
Hunk #4 succeeded at 458 (offset 2 lines).
Hunk #5 succeeded at 535 (offset 2 lines).
Hunk #6 succeeded at 1587 (offset 2 lines).
Hunk #7 succeeded at 2033 (offset 2 lines).
Hunk #8 succeeded at 2862 (offset 2 lines).
Hunk #9 succeeded at 2915 (offset 2 lines).
Hunk #10 succeeded at 2943 (offset 2 lines).
Hunk #11 succeeded at 2959 (offset 2 lines).
Hunk #12 succeeded at 2985 (offset 2 lines).
Hunk #13 succeeded at 3073 (offset 2 lines).
Hunk #14 succeeded at 3097 (offset 2 lines).
Hunk #15 succeeded at 3111 (offset 2 lines).
Hunk #16 succeeded at 3168 (offset 2 lines).
Hunk #17 succeeded at 3180 (offset 2 lines).
Hunk #18 succeeded at 3194 (offset 2 lines).
Hunk #19 succeeded at 3252 (offset 2 lines).
Hunk #20 succeeded at 3297 (offset 2 lines).
Hunk #21 succeeded at 3333 (offset 2 lines).
Hunk #22 succeeded at 3395 (offset 2 lines).
Hunk #23 succeeded at 3450 (offset 2 lines).
Hunk #24 succeeded at 3513 (offset 2 lines).
Hunk #25 succeeded at 3521 (offset 2 lines).
Hunk #26 succeeded at 3548 (offset 2 lines).
Hunk #27 succeeded at 3581 (offset 2 lines).
Hunk #28 succeeded at 3747 (offset 2 lines).
1 out of 28 hunks FAILED -- saving rejects to file pcm_native.c.rej

[ume at plb alsa-driver]$ more acore/pcm_native.c.rej
--- ../alsa-kernel/core/pcm_native.c	2010-09-16 23:10:16.996220991 +0200
+++ pcm_native.c	2010-09-17 12:23:15.092424934 +0200
@@ -22,9 +24,9 @@
  */

 #include <linux/mm.h>
+#include <linux/smp_lock.h>
 #include <linux/file.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/time.h>
 #include <linux/pm_qos_params.h>
 #include <linux/uio.h>