From 367612ac81ad647784d3e8b3c74dffeb154f7267 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Sat, 19 Jun 2010 16:54:09 +0200
Subject: maj module-init-tools#3.12-1

---
 base/module-init-tools/Pkgfile           |  6 ++---
 base/module-init-tools/blacklist-fb      | 37 ------------------------------
 base/module-init-tools/blacklist-fb.conf | 39 ++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 40 deletions(-)
 delete mode 100644 base/module-init-tools/blacklist-fb
 create mode 100644 base/module-init-tools/blacklist-fb.conf

diff --git a/base/module-init-tools/Pkgfile b/base/module-init-tools/Pkgfile
index fff52340d..70f9cbfcb 100755
--- a/base/module-init-tools/Pkgfile
+++ b/base/module-init-tools/Pkgfile
@@ -5,10 +5,10 @@
 # Depends on:
 
 name=module-init-tools
-version=3.11.1
+version=3.12
 release=1
 source=(http://www.kernel.org/pub/linux/utils/kernel/$name/$name-$version.tar.bz2\
-	modprobe.conf blacklist-fb)
+	modprobe.conf blacklist-fb.conf)
 
 build() {
 cd $name-$version
@@ -25,5 +25,5 @@ install -d $PKG/etc/{modprobe.d,depmod.d}
 make DESTDIR=$PKG mandir=/usr/share/man install
 rm -f $PKG/sbin/generate-modprobe.conf
 install -m 644 ../modprobe.conf $PKG/etc/modprobe.d/modprobe.conf
-install -m 644 ../blacklist-fb $PKG/etc/modprobe.d/
+install -m 644 ../blacklist-fb.conf $PKG/etc/modprobe.d/
 }
diff --git a/base/module-init-tools/blacklist-fb b/base/module-init-tools/blacklist-fb
deleted file mode 100644
index c77bd22dd..000000000
--- a/base/module-init-tools/blacklist-fb
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Listing a module here prevents the hotplug scripts from loading it.
-# Usually that'd be so that some other driver will bind it instead,
-# no matter which driver happens to get probed first.  Sometimes user
-# mode tools can also control driver binding.
-#
-# Syntax:  driver name alone (without any spaces) on a line. Other
-# lines are ignored.
-#
-
-# watchdog drivers
-blacklist i8xx_tco
-
-# framebuffer drivers
-blacklist aty128fb
-blacklist atyfb
-blacklist radeonfb
-blacklist i810fb
-blacklist cirrusfb
-blacklist intelfb
-blacklist kyrofb
-blacklist i2c-matroxfb
-blacklist hgafb
-blacklist nvidiafb
-blacklist rivafb
-blacklist savagefb
-blacklist sstfb
-blacklist neofb
-blacklist tridentfb
-blacklist tdfxfb
-blacklist virgefb
-blacklist vga16fb
-blacklist matroxfb_base
-
-# ISDN - see bugs 154799, 159068
-blacklist hisax
-blacklist hisax_fcpcipnp
diff --git a/base/module-init-tools/blacklist-fb.conf b/base/module-init-tools/blacklist-fb.conf
new file mode 100644
index 000000000..4b0c0508e
--- /dev/null
+++ b/base/module-init-tools/blacklist-fb.conf
@@ -0,0 +1,39 @@
+#
+# Listing a module here prevents the hotplug scripts from loading it.
+# Usually that'd be so that some other driver will bind it instead,
+# no matter which driver happens to get probed first.  Sometimes user
+# mode tools can also control driver binding.
+#
+# Syntax:  driver name alone (without any spaces) on a line. Other
+# lines are ignored.
+#
+
+# watchdog drivers
+blacklist i8xx_tco
+
+# framebuffer drivers
+blacklist aty128fb
+blacklist atyfb
+blacklist radeondrmfb
+blacklist radeon
+blacklist radeonfb
+blacklist i810fb
+blacklist cirrusfb
+blacklist intelfb
+blacklist kyrofb
+blacklist i2c-matroxfb
+blacklist hgafb
+blacklist nvidiafb
+blacklist rivafb
+blacklist savagefb
+blacklist sstfb
+blacklist neofb
+blacklist tridentfb
+blacklist tdfxfb
+blacklist virgefb
+blacklist vga16fb
+blacklist matroxfb_base
+
+# ISDN - see bugs 154799, 159068
+blacklist hisax
+blacklist hisax_fcpcipnp
-- 
cgit v1.2.3-70-g09d2