Merge remote-tracking branch 'origin/kernel-update' into glibc-update2

[people/teissler/ipfire-2.x.git] / lfs / mISDN

diff --git a/lfs/mISDN b/lfs/mISDN
index 8eec207819a077c801b469c78ce83cc2d1837535..c73f5196b12358a60b11c7acae2060084a24b5b8 100644 (file)
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,15 +24,7 @@
 
 include Config
 
-ifeq "$(PAE)" "1"
-       VERSUFIX=ipfire-pae
-else
-ifeq "$(XEN)" "1"
-       VERSUFIX=ipfire-xen
-else
-       VERSUFIX=ipfire
-endif
-endif
+VERSUFIX=ipfire$(KCFG)
 
 VER        = 20100525
 
@@ -82,6 +74,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_SRC)/mISDN* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch
        cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch
+ifeq "$(MACHINE_TYPE)" "arm"
+       # Remove unsupported timestampcounter on arm. the result seems to be unused
+       cd $(DIR_SRC)/mISDN && sed -i -e "s|rdtscl(pChan->ulTimestampIn);||g" drivers/isdn/mISDN/octvqe/octvqe_linux.c
+endif
        cd $(DIR_SRC)/mISDN && ./configure --with-kerneldir=/usr/src/linux
        cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) modules
        cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) \