Compile errors Patching 2.6.11.7 to 2.6.12-rc2

["Brian W. Carver" <brianwc@berkeley.edu>]

Hi,

I want to apply Ben's sound patch for new powerbooks. By 
looking at the patch I saw that it seemed to be applied 
against 2.6.12-rc2 so here's exactly what I did and the 
compilation error that resulted:

download 2.6.11.7 from kernel.org and put it in /usr/src
tar -jxf linux-2.6.11.7.tar.bz2
rm /usr/src/linux
ln -s linux-2.6.11.7 linux
download patch-2.6.12-rc2.bz2
 bunzip2 patch-2.6.12-rc2.bz2
 mv patch-2.6.12-rc2 /usr/src/linux
cd /usr/src/linux
patch -p1 <patch-2.6.12-rc2 #there will be errors. Keep 
hitting enter.
Download benssoundpatch from 
http://sharealike.net/debian/ppc/benssoundpatch and
mv benssoundpatch /usr/src/linux
patch -p1 <benssoundpatch
cp /boot/config-2.6.8-powerpc .config
make oldconfig #accept the defaults on everything and 
[1-32] your answer is 1.
make-kpkg clean
make-kpkg --append-to-version=.050414 kernel_image

Compiling goes OK until this error:

  CC      net/ipv4/xfrm4_policy.o
  CC      net/ipv4/xfrm4_state.o
  CC      net/ipv4/xfrm4_input.o
  CC      net/ipv4/xfrm4_output.o
net/ipv4/xfrm4_output.c: In function `xfrm4_output':
net/ipv4/xfrm4_output.c:119: warning: passing arg 1 of 
pointer to function from incompatible pointer type
net/ipv4/xfrm4_output.c:119: error: too few arguments to 
function
make[3]: *** [net/ipv4/xfrm4_output.o] Error 1
make[2]: *** [net/ipv4] Error 2
make[1]: *** [net] Error 2
make[1]: Leaving directory `/usr/src/linux-2.6.11.7'
make: *** [stamp-build] Error 2

Any ideas?

Brian

P.S. Ben's speed patch, Colin's temperature patch, and 
Johannes' trackpad driver all barfed when I attempted to 
add them after the 2.6.12-rc patch and Ben's sound patch 
(which seemed to apply ok). I'd like to apply those other 
patches too, but first I'd like to see if I could get 
sound.