X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2FmISDN;h=5cd4972ca3c5b576f161405fbc54365f79f5c214;hp=0fe76ec3758e82480ff9a688ab678e54fe7f36e6;hb=7bb66417fa6908750cf083e90805d7e498ff161e;hpb=ed879161a868e9a9afe5f93ff1625a729eddb510

diff --git a/lfs/mISDN b/lfs/mISDN
index 0fe76ec37..5cd4972ca 100644
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -27,7 +27,7 @@ include Config
 VERSUFIX=ipfire$(KCFG)
 
 ifeq "$(KCFG)" "-xen"
-	KVER = "2.6.32.60"
+	KVER = "2.6.32.61"
 endif
 
 VER        = 20121008
@@ -106,10 +106,14 @@ endif
 ifneq "$(XEN)" "1"
 	# Blacklist misdn modules
 	for f in $$(find /lib/modules/$(KVER)-$(VERSUFIX)/mISDN -name *.ko); do \
-		echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/mISDN ; \
+		echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/mISDN.conf ; \
 	done
-	sed -i -e "s|.ko||g" /etc/modprobe.d/mISDN
+	sed -i -e "s|.ko||g" /etc/modprobe.d/mISDN.conf
 endif
 
+	# Remove mISDN modules that was shipped with the kernel
+	rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
+	rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
+
 	@rm -rf $(DIR_SRC)/mISDN*
 	@$(POSTBUILD)