From dc5ecc1c8ca4c530d8149e06e814f0208efb9139 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Fri, 11 Nov 2011 22:02:16 +0100 Subject: [PATCH] module-init-tools: Remove conflicting file. The /etc/modproble.d/blacklist.conf conflicted with the shipped of hwdata. --- module-init-tools/modprobe.d/blacklist.conf | 38 --------------------- module-init-tools/module-init-tools.nm | 2 +- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 module-init-tools/modprobe.d/blacklist.conf diff --git a/module-init-tools/modprobe.d/blacklist.conf b/module-init-tools/modprobe.d/blacklist.conf deleted file mode 100644 index b393b2278..000000000 --- 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 a26077686..06d8f6e0d 100644 --- 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/ -- 2.39.2