Merge branch 'thirteen' of git.ipfire.org:/pub/git/ipfire-2.x into thirteen

diff --git a/lfs/mISDN b/lfs/mISDN
index e0469c468fff76221f13edf3dd4fdc5112ed96d1..0fe76ec3758e82480ff9a688ab678e54fe7f36e6 100644 (file)
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -81,6 +81,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 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
+ifeq "$(NOPCI)" "1"
+       # Disable PCI drivers if kernel has no PCI
+       cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_HFCPCI|#&|g" mISDN.cfg.default
+       cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_HFCMULTI|#&|g" mISDN.cfg.default
+       cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_XHFC|#&|g" mISDN.cfg.default
+       cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_AVMFRITZ|#&|g" mISDN.cfg.default
+       cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_SPEEDFAX|#&|g" mISDN.cfg.default
+       cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_INFINEON|#&|g" mISDN.cfg.default
+       cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_W6692|#&|g" mISDN.cfg.default
+       cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_NETJET|#&|g" mISDN.cfg.default
+       cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_IPAC|#&|g" mISDN.cfg.default
+       cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_ISAR|#&|g" mISDN.cfg.default
 endif
        cd $(DIR_SRC)/mISDN && ./configure --with-kerneldir=/usr/src/linux
        cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) modules

diff --git a/make.sh b/make.sh
index d3a7a8326e4b30aa0a92773406e582a68652a131..d8de79263a0656c86da3f0697805e3355bc92ee9 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -421,7 +421,7 @@ buildipfire() {
     ipfiremake linux                   KCFG="-rpi"
     ipfiremake v4l-dvb                 KCFG="-rpi"
 #    ipfiremake kvm-kmod                       KCFG="-rpi"
-#    ipfiremake mISDN                  KCFG="-rpi"
+    ipfiremake mISDN                   KCFG="-rpi" NOPCI=1
     ipfiremake cryptodev               KCFG="-rpi"
     ipfiremake compat-wireless         KCFG="-rpi"
 #    ipfiremake r8169                  KCFG="-rpi"
@@ -434,7 +434,7 @@ buildipfire() {
     ipfiremake linux                   KCFG="-omap"
     ipfiremake v4l-dvb                 KCFG="-omap"
 #    ipfiremake kvm-kmod                       KCFG="-omap"
-#    ipfiremake mISDN                  KCFG="-omap"
+    ipfiremake mISDN                   KCFG="-omap" NOPCI=1
     ipfiremake cryptodev               KCFG="-omap"
     ipfiremake compat-wireless         KCFG="-omap"
 #    ipfiremake r8169                  KCFG="-omap"
@@ -448,7 +448,7 @@ buildipfire() {
     ipfiremake linux                   KCFG="-kirkwood"
     ipfiremake v4l-dvb                 KCFG="-kirkwood"
 #    ipfiremake kvm-kmod                       KCFG="-kirkwood"
-#    ipfiremake mISDN                  KCFG="-kirkwood"
+    ipfiremake mISDN                   KCFG="-kirkwood"
     ipfiremake cryptodev               KCFG="-kirkwood"
     ipfiremake compat-wireless         KCFG="-kirkwood"
 #    ipfiremake r8169                  KCFG="-kirkwood"