Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 20 Apr 2009 17:39:10 +0000 (19:39 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 20 Apr 2009 17:39:10 +0000 (19:39 +0200)
Conflicts:
make.sh

1  2 
make.sh

diff --cc make.sh
+++ b/make.sh
@@@ -345,8 -345,7 +345,9 @@@ buildipfire() 
    ipfiremake alsa                     KMOD=1
    ipfiremake openswan                 KMOD=1
    ipfiremake mISDN
 +  ipfiremake which
 +  ipfiremake compat-wireless
+   ipfiremake linux                    XEN=1
    ipfiremake pkg-config
    ipfiremake linux-atm
    ipfiremake cpio