← Back to branch summary

~ubuntu-branches/ubuntu/precise/alsa-driver/precise

« back to all changes in this revision

Viewing changes to debian/patches/distinguish_kernel_makefile_and_source_dirs.patch

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2010-06-04 11:52:55 UTC
  • mfrom: (3.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20100604115255-tu8woz22vgmcyrql
Tags: 1.0.23+dfsg-1ubuntu1
* Merge from debian alsa-driver svn, remaining changes:
  - Script paths (/usr/sbin -> /sbin, /usr/bin -> /bin);
  - debian/rules:
    + Don't install snddevices and program-wrapper
    + install alsa-base apport hook
    + Package separate USB card list file
  - Vcs and maintainer fields mangling
  - Rename blacklist files in /etc/modprobe.d to be consistant with the rest
    of the distro
  - debian/alsa-base.init:
    + create /var/run/alsa if it doesn't exist
    + Run alsactl store before force unloading modules
    + Run alsactl restore after reloading unloaded modules
  - debian/linux-sound-base.postrm: Remove /etc/modprobe.d/blacklist* files
    on package removal
  - Add missing $CMDLINE_OPTS to all install rules.
  - Replace -Q with --quiet.
  - Add --use-blacklist to all rules so the blacklist still takes effect.
  - debian/alsa-base.postinst: Do not run snddevices
  - retain patches:
    + add_suspend_quirk_hp_nc6220_nw8240.patch,
    + refix_lp_68659_by_disabling_dxs_for_0x1458a002.patch.
  - Drop kernel-package recommends to a suggests in order to be able to demote
    kernel-package to universe

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/distinguish_kernel_makefile_and_source_dirs.patch
 
1
From: Ben Hutchings <ben@decadent.org.uk>
 
2
Subject: [PATCH] Distinguish kernel makefile and source directories
 
3
Last-Update: 2010-05-23
 
4
 
 
5
The directory containing the top-level makefile is not the one
 
6
containing source and/or headers when using Debian or SUSE kernel
 
7
packages.  With current Debian kernel packages, the header file
 
8
checks produce false negatives.
 
9
 
 
10
Index: alsa-driver-1.0.23+dfsg/configure.in
 
11
===================================================================
 
12
--- alsa-driver-1.0.23+dfsg.orig/configure.in   2010-05-28 19:14:23.000000000 +0200
 
13
+++ alsa-driver-1.0.23+dfsg/configure.in        2010-05-28 19:14:23.000000000 +0200
 
14
@@ -85,8 +85,8 @@
 
15
 AC_MSG_RESULT($alsakerneldir)
 
16
 AC_SUBST(ALSAKERNELDIR)
 
17
 
 
18
-dnl Check for directory with kernel source...
 
19
-AC_MSG_CHECKING(for directory with kernel source)
 
20
+dnl Check for directory with kernel top-level makefile...
 
21
+AC_MSG_CHECKING(for directory with kernel top-level makefile)
 
22
 if test -d "/lib/modules/`uname -r`/source" -o -L "/lib/modules/`uname -r`/source"; then
 
23
   DEFAULT_KERNEL_DIR="/lib/modules/`uname -r`/source"
 
24
   DEFAULT_KERNEL_BUILD="/lib/modules/`uname -r`/build"
 
25
@@ -96,7 +96,7 @@
 
26
   DEFAULT_KERNEL_DIR="/usr/src/linux"
 
27
 fi
 
28
 AC_ARG_WITH(kernel,
 
29
-  [  --with-kernel=dir       give the directory with kernel sources]
 
30
+  [  --with-kernel=dir       give the directory with kernel top-level makefile]
 
31
   [                        [[/usr/src/linux]]],
 
32
   [kerneldir="$withval"
 
33
    DEFAULT_KERNEL_BUILD=""],
 
34
@@ -114,6 +114,25 @@
 
35
 fi
 
36
 AC_MSG_RESULT($kerneldir)
 
37
 
 
38
+dnl Check for directory with kernel source/headers...
 
39
+AC_MSG_CHECKING(for directory with kernel headers)
 
40
+dir="$(mktemp -d)"
 
41
+if test -z "$dir"; then
 
42
+  echo >&2 "failed to create temporary directory"
 
43
+  exit 1
 
44
+fi
 
45
+echo "\$(warning KBUILD_SRC=\$(KBUILD_SRC))" > "$dir"/Makefile
 
46
+kernelsrc=$(make -C "$CONFIG_SND_KERNELDIR" M="$dir" 2>&1 >/dev/null | \
 
47
+           sed -n "s#^$dir/Makefile:.*: KBUILD_SRC=\(.*\)\$#\1#; T; p; q")
 
48
+rm -rf "$dir"
 
49
+if test -z "$kernelsrc"; then
 
50
+  AC_MSG_RESULT(failed)
 
51
+  exit 1
 
52
+else
 
53
+  CONFIG_SND_KERNELSRC="$kernelsrc"
 
54
+  AC_MSG_RESULT($kernelsrc)
 
55
+fi
 
56
+
 
57
 dnl Check for directory with kernel build tree...
 
58
 AC_MSG_CHECKING(for directory with kernel build)
 
59
 AC_ARG_WITH(build,
 
60
@@ -127,16 +146,16 @@
 
61
 AC_DEFUN([CHECK_REQUIRED_KERNEL_HEADER], [
 
62
   $1="$2"
 
63
   AC_MSG_CHECKING(for kernel $2 $3)
 
64
-  if ! test -r $CONFIG_SND_KERNELDIR/include/$2; then
 
65
+  if ! test -r $CONFIG_SND_KERNELSRC/include/$2; then
 
66
     if test -z "$kernelbuild" -o ! -f $kernelbuild/include/$2; then
 
67
       if test -n "$3"; then
 
68
        $1="$3"
 
69
-       if ! test -r $CONFIG_SND_KERNELDIR/include/$3; then
 
70
+       if ! test -r $CONFIG_SND_KERNELSRC/include/$3; then
 
71
          if test -z "$kernelbuild" -o ! -f $kernelbuild/include/$3; then
 
72
            AC_MSG_RESULT(no)
 
73
            cat << EOF
 
74
-The file $CONFIG_SND_KERNELDIR/include/$2 does not exist.
 
75
-The file $CONFIG_SND_KERNELDIR/include/$3 does not exist.
 
76
+The file $CONFIG_SND_KERNELSRC/include/$2 does not exist.
 
77
+The file $CONFIG_SND_KERNELSRC/include/$3 does not exist.
 
78
 Please install the package with full kernel sources for your distribution
 
79
 or use --with-kernel=dir option to specify another directory with kernel
 
80
 sources (default is $DEFAULT_KERNEL_DIR).
 
81
@@ -147,7 +166,7 @@
 
82
       else
 
83
         AC_MSG_RESULT(no)
 
84
         cat << EOF
 
85
-The file $CONFIG_SND_KERNELDIR/include/$1 does not exist.
 
86
+The file $CONFIG_SND_KERNELSRC/include/$1 does not exist.
 
87
 Please install the package with full kernel sources for your distribution
 
88
 or use --with-kernel=dir option to specify another directory with kernel
 
89
 sources (default is $DEFAULT_KERNEL_DIR).
 
90
@@ -165,14 +184,14 @@
 
91
 AC_DEFUN([CHECK_POSSIBLE_KERNEL_HEADER], [
 
92
   $1=""
 
93
   AC_MSG_CHECKING(for kernel $2 $3)
 
94
-  if test -r $CONFIG_SND_KERNELDIR/include/$2; then
 
95
+  if test -r $CONFIG_SND_KERNELSRC/include/$2; then
 
96
     $1="$2"
 
97
   else
 
98
     if test -n "$kernelbuild" -a -f $kernelbuild/include/$2; then
 
99
       $1="$2"
 
100
     else
 
101
       if test -n "$3"; then
 
102
-       if test -r $CONFIG_SND_KERNELDIR/include/$3; then
 
103
+       if test -r $CONFIG_SND_KERNELSRC/include/$3; then
 
104
          $1="$3"
 
105
         else
 
106
          if test -n "$kernelbuild" -a -f $kernelbuild/include/$3; then
 
107
@@ -193,7 +212,7 @@
 
108
 
 
109
 dnl Check for kernel version...
 
110
 AC_MSG_CHECKING(for kernel version)
 
111
-KERNEL_INC="-I$CONFIG_SND_KERNELDIR/include"
 
112
+KERNEL_INC="-I$CONFIG_SND_KERNELSRC/include"
 
113
 MAKE_ADDS=""
 
114
 if test -n "$kernelbuild"; then
 
115
   kpath=""
 
116
@@ -212,7 +231,7 @@
 
117
 if test -n "$kernelbuild" -a -f $kernelbuild/include/$INCLUDE_VERSION_H; then
 
118
   KERNDIR=$kernelbuild
 
119
 else
 
120
-  KERNDIR=$CONFIG_SND_KERNELDIR
 
121
+  KERNDIR=$CONFIG_SND_KERNELSRC
 
122
 fi
 
123
 AC_TRY_RUN([
 
124
 #include <stdio.h>
 
125
@@ -269,9 +288,9 @@
 
126
 ksublevel=`expr $ksublevel + 0`
 
127
 if test "$kversion" = "0" -a "$kpatchlevel" = "0" -a "$ksublevel" = "0"; then
 
128
   AC_MSG_RESULT(failed)
 
129
-  echo "  (probably missing $CONFIG_SND_KERNELDIR/include/linux/version.h or"
 
130
-  echo "                    $CONFIG_SND_KERNELDIR/include/linux/utsrelease.h or"
 
131
-  echo "                    $CONFIG_SND_KERNELDIR/include/generated/utsrelease.h)"
 
132
+  echo "  (probably missing $CONFIG_SND_KERNELSRC/include/linux/version.h or"
 
133
+  echo "                    $CONFIG_SND_KERNELSRC/include/linux/utsrelease.h or"
 
134
+  echo "                    $CONFIG_SND_KERNELSRC/include/generated/utsrelease.h)"
 
135
   exit 1
 
136
 fi
 
137
 kaversion="$kversion.$kpatchlevel.$ksublevel$kextraversion"
 
138
@@ -290,7 +309,7 @@
 
139
 if test -n "$kernelbuild" -a -f $kernelbuild/include/linux/compile.h; then
 
140
   KERNDIR=$kernelbuild
 
141
 else
 
142
-  KERNDIR=$CONFIG_SND_KERNELDIR
 
143
+  KERNDIR=$CONFIG_SND_KERNELSRC
 
144
 fi
 
145
 
 
146
 AC_TRY_RUN([
 
147
@@ -306,7 +325,7 @@
 
148
 #ifdef LINUX_COMPILER
 
149
  f=fopen("./conftestdata","w");
 
150
  if (f) {
 
151
-   for (ptr = LINUX_COMPILER, dptr = compiler; *ptr != '\0' && *ptr != ' ' && *ptr != '\t'; ptr++, dptr++)
 
152
+for (ptr = LINUX_COMPILER, dptr = compiler; *ptr != '\0' && *ptr != ' ' && *ptr != '\t'; ptr++, dptr++)
 
153
      *dptr = *ptr;
 
154
    if (*ptr != '\0' && (*ptr == ' ' || *ptr == '\t'))
 
155
      ptr++;
 
156
@@ -440,7 +459,7 @@
 
157
   if test -n "$kernelbuild" -a \( -f "$kernelbuild/include/$1" -o -f "$kernelbuild/include2/$1" -o -f "$kernelbuild/arch/$ARCHDIR/include/$1" \) ; then
 
158
     KERNDIR=$kernelbuild
 
159
   else
 
160
-    KERNDIR=$CONFIG_SND_KERNELDIR
 
161
+    KERNDIR=$CONFIG_SND_KERNELSRC
 
162
   fi
 
163
   if test -n "$3"; then
 
164
     eval $3=""
 
165
@@ -475,7 +494,7 @@
 
166
   if test -n "$kernelbuild" -a \( -f "$kernelbuild/include/$1" -o -f "$kernelbuild/include2/$1" -o -f "$kernelbuild/arch/$ARCHDIR/include/$1" \) ; then
 
167
     KERNDIR=$kernelbuild
 
168
   else
 
169
-    KERNDIR=$CONFIG_SND_KERNELDIR
 
170
+    KERNDIR=$CONFIG_SND_KERNELSRC
 
171
   fi
 
172
   if grep -q $2 "$KERNDIR/include/$1" "$KERNDIR/include2/$1" "$KERNDIR/arch/$ARCHDIR/include/$1" > /dev/null 2>&1; then
 
173
     AC_MSG_RESULT(no)
 
174
@@ -502,7 +521,7 @@
 
175
   if test -n "$kernelbuild" -a -f "$kernelbuild/include/$INCLUDE_AUTOCONF_H"; then
 
176
     KERNDIR=$kernelbuild
 
177
   else
 
178
-    KERNDIR=$CONFIG_SND_KERNELDIR
 
179
+    KERNDIR=$CONFIG_SND_KERNELSRC
 
180
   fi
 
181
   boolchk=""
 
182
   AC_TRY_RUN([
 
183
@@ -533,7 +552,7 @@
 
184
   if test -n "$kernelbuild" -a -f "$kernelbuild/include/$INCLUDE_AUTOCONF_H"; then
 
185
     KERNDIR=$kernelbuild
 
186
   else
 
187
-    KERNDIR=$CONFIG_SND_KERNELDIR
 
188
+    KERNDIR=$CONFIG_SND_KERNELSRC
 
189
   fi
 
190
   boolchk=""
 
191
   AC_TRY_RUN([
 
192
@@ -564,7 +583,7 @@
 
193
   if test -n "$kernelbuild" -a -f "$kernelbuild/include/$INCLUDE_AUTOCONF_H"; then
 
194
     KERNDIR=$kernelbuild
 
195
   else
 
196
-    KERNDIR=$CONFIG_SND_KERNELDIR
 
197
+    KERNDIR=$CONFIG_SND_KERNELSRC
 
198
   fi
 
199
   tristatechk=""
 
200
   AC_TRY_RUN([
 
201
@@ -610,7 +629,7 @@
 
202
   AC_MSG_CHECKING(for exported symbol $2)
 
203
   ac_save_CFLAGS="$CFLAGS"
 
204
   boolchk=""
 
205
-  if grep EXPORT_SYMBOL "$CONFIG_SND_KERNELDIR/kernel/ksyms.c" | grep "$2" > /dev/null; then
 
206
+  if grep EXPORT_SYMBOL "$CONFIG_SND_KERNELSRC/kernel/ksyms.c" | grep "$2" > /dev/null; then
 
207
     AC_MSG_RESULT(yes);boolchk="y"
 
208
     AC_DEFINE($1)
 
209
   else
 
210
@@ -673,6 +692,8 @@
 
211
 dnl define kernel directory now
 
212
 AC_DEFINE_UNQUOTED(CONFIG_SND_KERNELDIR, "$CONFIG_SND_KERNELDIR")
 
213
 AC_SUBST(CONFIG_SND_KERNELDIR)
 
214
+AC_DEFINE_UNQUOTED(CONFIG_SND_KERNELSRC, "$CONFIG_SND_KERNELSRC")
 
215
+AC_SUBST(CONFIG_SND_KERNELSRC)
 
216
 AC_SUBST(MAKE_ADDS)
 
217
 
 
218
 dnl update include/sound/version.h
 
219
@@ -831,7 +852,7 @@
 
220
 if test -n "$kernelbuild" -a -f "$kernelbuild/include/$INCLUDE_AUTOCONF_H"; then
 
221
   KERNDIR=$kernelbuild
 
222
 else
 
223
-  KERNDIR=$CONFIG_SND_KERNELDIR
 
224
+  KERNDIR=$CONFIG_SND_KERNELSRC
 
225
 fi
 
226
 AC_TRY_RUN([
 
227
 #include <stdio.h>
 
228
@@ -1072,8 +1093,8 @@
 
229
        fi
 
230
     fi
 
231
     c_opts="-D__powerpc__ -fsigned-char -fno-builtin -msoft-float -ffixed-r2 -Wno-uninitialized -mmultiple -mstring"
 
232
-    if test -d $CONFIG_SND_KERNELDIR/arch/ppc/include; then
 
233
-      KERNEL_INC="$KERNEL_INC -I$CONFIG_SND_KERNELDIR/arch/ppc/include"
 
234
+    if test -d $CONFIG_SND_KERNELSRC/arch/ppc/include; then
 
235
+      KERNEL_INC="$KERNEL_INC -I$CONFIG_SND_KERNELSRC/arch/ppc/include"
 
236
     fi
 
237
     CONFIG_PPC=y
 
238
     CONFIG_PPC32=y
 
239
@@ -1229,8 +1250,8 @@
 
240
       ARCHDIR=$ARCH
 
241
       ;;
 
242
    esac
 
243
-   if test -d $CONFIG_SND_KERNELDIR/arch/$ARCHDIR/include; then
 
244
-      KERNEL_INC="$KERNEL_INC -I$CONFIG_SND_KERNELDIR/arch/$ARCHDIR/include"
 
245
+   if test -d $CONFIG_SND_KERNELSRC/arch/$ARCHDIR/include; then
 
246
+      KERNEL_INC="$KERNEL_INC -I$CONFIG_SND_KERNELSRC/arch/$ARCHDIR/include"
 
247
    fi
 
248
 fi
 
249
 
 
250
@@ -1244,8 +1265,8 @@
 
251
       CONFIG_X86_32=y
 
252
     fi
 
253
     for i in include/asm-x86 include/asm-i386 include2/asm-x86 include2/asm-i386 arch/x86/include/asm; do
 
254
-      if test -r $CONFIG_SND_KERNELDIR/$i/mach-default/mach_apic.h; then
 
255
-        mach_dir="$CONFIG_SND_KERNELDIR/$i"
 
256
+      if test -r $CONFIG_SND_KERNELSRC/$i/mach-default/mach_apic.h; then
 
257
+        mach_dir="$CONFIG_SND_KERNELSRC/$i"
 
258
        break
 
259
       fi  
 
260
       if test -n "$kernelbuild" -a -r $kernelbuild/$i/mach-default/mach_apic.h; then
 
261
@@ -1256,8 +1277,8 @@
 
262
     ;;
 
263
   x86_64)
 
264
     for i in include/asm-x86 include2/asm-x86 arch/x86/include/asm; do
 
265
-      if test -r $CONFIG_SND_KERNELDIR/$i/mach-default/mach_apic.h; then
 
266
-        mach_dir="$CONFIG_SND_KERNELDIR/$i"
 
267
+      if test -r $CONFIG_SND_KERNELSRC/$i/mach-default/mach_apic.h; then
 
268
+        mach_dir="$CONFIG_SND_KERNELSRC/$i"
 
269
        break
 
270
       fi  
 
271
       if test -n "$kernelbuild" -a -r $kernelbuild/$i/mach-default/mach_apic.h; then
 
272
@@ -1278,8 +1299,8 @@
 
273
        checkarch="$ARCH"
 
274
        ;;
 
275
     esac
 
276
-    if test -d $CONFIG_SND_KERNELDIR/arch/$checkarch/include; then
 
277
-       KERNEL_INC="$KERNEL_INC -I$CONFIG_SND_KERNELDIR/arch/$checkarch/include"
 
278
+    if test -d $CONFIG_SND_KERNELSRC/arch/$checkarch/include; then
 
279
+       KERNEL_INC="$KERNEL_INC -I$CONFIG_SND_KERNELSRC/arch/$checkarch/include"
 
280
     fi
 
281
 fi
 
282
 
 
283
@@ -1292,7 +1313,7 @@
 
284
   if test -n "$kernelbuild" -a -f "$kernelbuild/include/$INCLUDE_AUTOCONF_H"; then
 
285
     KERNDIR=$kernelbuild
 
286
   else
 
287
-    KERNDIR=$CONFIG_SND_KERNELDIR
 
288
+    KERNDIR=$CONFIG_SND_KERNELSRC
 
289
   fi
 
290
   AC_TRY_RUN([
 
291
 #include <stdio.h>
 
292
@@ -1343,7 +1364,7 @@
 
293
        if test -n "$kernelbuild" -a -f "$kernelbuild/include/$INCLUDE_AUTOCONF_H"; then
 
294
          KERNDIR=$kernelbuild
 
295
        else
 
296
-         KERNDIR=$CONFIG_SND_KERNELDIR
 
297
+         KERNDIR=$CONFIG_SND_KERNELSRC
 
298
        fi
 
299
        AC_TRY_RUN([
 
300
 #include <stdio.h>
 
301
@@ -1417,7 +1438,7 @@
 
302
 CONFIG_SGI=""
 
303
 if test "$CONFIG_MIPS" = "y"; then
 
304
   AC_MSG_CHECKING(for SGI/MIPS (HAL2) architecture)
 
305
-  if test -r "$CONFIG_SND_KERNELDIR/include/asm/sgi/sgihpc.h"; then
 
306
+  if test -r "$CONFIG_SND_KERNELSRC/include/asm/sgi/sgihpc.h"; then
 
307
     CONFIG_SGI="y"
 
308
   fi
 
309
   if test "$CONFIG_SGI" = "y"; then
 
310
@@ -1475,7 +1496,7 @@
 
311
 if test -n "$kernelbuild" -a \( -f "$kernelbuild/include/$1" -o -f "$kernelbuild/include2/$1" \) ; then
 
312
   KERNDIR=$kernelbuild
 
313
 else
 
314
-  KERNDIR=$CONFIG_SND_KERNELDIR
 
315
+  KERNDIR=$CONFIG_SND_KERNELSRC
 
316
 fi
 
317
 deprecated_config_h="0"
 
318
 if test -r $KERNDIR/include/linux/config.h ; then
 
319
@@ -1647,7 +1668,7 @@
 
320
 dnl Check for ISA PnP driver in kernel...
 
321
 AC_MSG_CHECKING(for ISA PnP driver in kernel)
 
322
 CONFIG_ISAPNP_KERNEL=
 
323
-if test -r $CONFIG_SND_KERNELDIR/include/linux/isapnp.h; then
 
324
+if test -r $CONFIG_SND_KERNELSRC/include/linux/isapnp.h; then
 
325
   AC_MSG_RESULT(yes)
 
326
   AC_DEFINE(CONFIG_ISAPNP_KERNEL)
 
327
   CONFIG_ISAPNP_KERNEL=y
 
328
@@ -1659,7 +1680,7 @@
 
329
 dnl Check for PnP layer (2.5+) in kernel...
 
330
 AC_MSG_CHECKING(for PnP driver in kernel)
 
331
 CONFIG_PNP_KERNEL=
 
332
-if test -r $CONFIG_SND_KERNELDIR/include/linux/pnp.h; then
 
333
+if test -r $CONFIG_SND_KERNELSRC/include/linux/pnp.h; then
 
334
   AC_MSG_RESULT(yes)
 
335
   AC_DEFINE(CONFIG_PNP_KERNEL)
 
336
   CONFIG_PNP_KERNEL=y
 
337
@@ -3482,8 +3503,8 @@
 
338
   mkdir -p include/linux include/generated
 
339
   if test -n "$kernelbuild" -a -r $kernelbuild/include/$INCLUDE_AUTOCONF_H ; then
 
340
     kernconf="$kernelbuild/include/$INCLUDE_AUTOCONF_H"
 
341
-  elif test -r  $CONFIG_SND_KERNELDIR/include/$INCLUDE_AUTOCONF_H ; then
 
342
-    kernconf="$CONFIG_SND_KERNELDIR/include/$INCLUDE_AUTOCONF_H"
 
343
+  elif test -r  $CONFIG_SND_KERNELSRC/include/$INCLUDE_AUTOCONF_H ; then
 
344
+    kernconf="$CONFIG_SND_KERNELSRC/include/$INCLUDE_AUTOCONF_H"
 
345
   else
 
346
       cat << EOF
 
347
 File include/$INCLUDE_AUTOCONF_H does not exist in kernel tree.
 
348
Index: alsa-driver-1.0.23+dfsg/include/i2c-id_compat.h.in
 
349
===================================================================
 
350
--- alsa-driver-1.0.23+dfsg.orig/include/i2c-id_compat.h.in     2010-05-28 19:12:09.000000000 +0200
 
351
+++ alsa-driver-1.0.23+dfsg/include/i2c-id_compat.h.in  2010-05-28 19:14:23.000000000 +0200
 
352
@@ -1,4 +1,4 @@
 
353
-#include "@CONFIG_SND_KERNELDIR@/include/linux/i2c-id.h"
 
354
+#include "@CONFIG_SND_KERNELSRC@/include/linux/i2c-id.h"
 
355
 
 
356
 #ifndef I2C_DRIVERID_WM8731
 
357
 #define I2C_DRIVERID_WM8731            89      /* Wolfson WM8731 audio codec */
 
358
Index: alsa-driver-1.0.23+dfsg/include/pci_ids_compat.h.in
 
359
===================================================================
 
360
--- alsa-driver-1.0.23+dfsg.orig/include/pci_ids_compat.h.in    2010-05-28 19:12:09.000000000 +0200
 
361
+++ alsa-driver-1.0.23+dfsg/include/pci_ids_compat.h.in 2010-05-28 19:14:23.000000000 +0200
 
362
@@ -1,5 +1,5 @@
 
363
 #ifndef LINUX_2_2
 
364
-#include "@CONFIG_SND_KERNELDIR@/include/linux/pci_ids.h"
 
365
+#include "@CONFIG_SND_KERNELSRC@/include/linux/pci_ids.h"
 
366
 #endif
 
367
 
 
368
 /* bt87x */