From e2e106be5633b49ac9391ea187c39f6f777596d3 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 19 Jun 2010 18:37:51 +0200
Subject: [PATCH] Update isdn modul blacklisting.

---
 config/rootfiles/common/linux |  1 +
 config/udev/blacklist         | 28 ----------------------------
 lfs/linux                     |  7 ++++++-
 3 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/config/rootfiles/common/linux b/config/rootfiles/common/linux
index bf979d396..adc8316eb 100644
--- a/config/rootfiles/common/linux
+++ b/config/rootfiles/common/linux
@@ -4,6 +4,7 @@ boot/config-KVER-ipfire
 boot/vmlinuz-KVER-ipfire
 boot/vmlinuz-ipfire
 etc/modprobe.d/framebuffer
+etc/modprobe.d/isdn
 #lib/firmware/keyspan/usa19qi.fw
 lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/build
diff --git a/config/udev/blacklist b/config/udev/blacklist
index 1085bf4fd..5e470a9ca 100644
--- a/config/udev/blacklist
+++ b/config/udev/blacklist
@@ -1,30 +1,2 @@
-blacklist hisax
-blacklist hisax_fcpcipnp
-blacklist hisax_isac
 blacklist crc_ccitt
-blacklist isdn
 blacklist slhc
-blacklist capi
-blacklist capifs
-blacklist kernelcapi
-blacklist kernel_capi
-blacklist avmfritz
-blacklist hfcmulti
-blacklist mISDN_core
-blacklist mISDN_l1
-blacklist mISDN_l2
-blacklist l3udss1
-blacklist mISDN_capi
-blacklist mISDN_isac
-blacklist hfcsusb
-blacklist hfcpci
-blacklist hfcsmini
-blacklist l1oip
-blacklist mISDN_dsp
-blacklist netjetpci
-blacklist sedlfax
-blacklist w6692pci
-blacklist xhfc
-blacklist mISDNinfineon
-blacklist avmfritz
-blacklist speedfax
diff --git a/lfs/linux b/lfs/linux
index 49a079488..8e1c7021e 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -190,7 +190,7 @@ endif
 
 ifneq "$(XEN)" "1"
 	# Blacklist matroxfb_base
-	echo "blacklist matroxfb_base >> /etc/modprobe.d/framebuffer
+	echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer
 	# Blacklist old framebuffer modules
 	for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video -name *fb.ko); do \
 		echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \
@@ -200,6 +200,11 @@ ifneq "$(XEN)" "1"
 		echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \
 	done
 	sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer
+
+	# Blacklist isdn modules
+	for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn -name *.ko); do \
+		echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn ; \
+	done
 endif
 
 	@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*
-- 
2.39.2