module-init-tools: Remove conflicting file.

The /etc/modproble.d/blacklist.conf conflicted with the shipped of hwdata.

diff --git a/module-init-tools/modprobe.d/blacklist.conf b/module-init-tools/modprobe.d/blacklist.conf
deleted file mode 100644 (file)
index b393b22..0000000
--- a/module-init-tools/modprobe.d/blacklist.conf
+++ /dev/null
@@ -1,38 +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 sisfb
-blacklist sstfb
-blacklist neofb
-blacklist tridentfb
-blacklist tdfxfb
-blacklist virgefb
-blacklist vga16fb
-
-# ISDN - see bugs 154799, 159068
-blacklist hisax
-blacklist hisax_fcpcipnp
-

diff --git a/module-init-tools/module-init-tools.nm b/module-init-tools/module-init-tools.nm
index a260776863b546671bb687ae2176f99d142ae6cc..06d8f6e0dd2fb80ebc88ede6f46f09d4543932f8 100644 (file)
--- a/module-init-tools/module-init-tools.nm
+++ b/module-init-tools/module-init-tools.nm
@@ -5,7 +5,7 @@
 
 name       = module-init-tools
 version    = 3.16
-release    = 2
+release    = 3
 
 groups     = System/Base
 url        = http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/