From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 9 Jun 2009 22:17:35 +0000 (+0200)
Subject: rules: remove scsi ch module loading rule
X-Git-Tag: 174~988
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=3dd8cbecde3c7708c5c5a71d4eb1dd042a5dc7fc;ds=sidebyside

rules: remove scsi ch module loading rule
---

diff --git a/TODO b/TODO
index af745ff5a..5cea74e75 100644
--- a/TODO
+++ b/TODO
@@ -3,8 +3,8 @@
   o add tests for kernel provided DEVNAME logic
   o drop modprobe floppy alias (SUSE), it will be in the module (2.6.30)
   o remove MMC rules, they got a modalias now (2.6.30)
-  o add scsi:t-0x09* to "ch" and remove modprobe rule (2.6.30)
-  o drop all support for the DEPRECATED sysfs layout
-  o "udevadm control" commands will only accept the --<command> syntax
+
   o symlink names to udevadm will no longer be resolved to old command names
+  o "udevadm control" commands will only accept the --<command> syntax
+  o drop all support for the DEPRECATED sysfs layout
   o add warning for BUS, SYSFS, ID
diff --git a/rules/rules.d/80-drivers.rules b/rules/rules.d/80-drivers.rules
index 7e13e8076..68420b9b1 100644
--- a/rules/rules.d/80-drivers.rules
+++ b/rules/rules.d/80-drivers.rules
@@ -8,7 +8,6 @@ SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/sbin/modprobe -b tifm_ms"
 SUBSYSTEM=="memstick", RUN+="/sbin/modprobe -b --all ms_block mspro_block"
 SUBSYSTEM=="mmc", RUN+="/sbin/modprobe -b mmc_block"
 SUBSYSTEM=="i2o", RUN+="/sbin/modprobe -b i2o_block"
-SUBSYSTEM=="scsi", ATTR{type}=="8", RUN+="/sbin/modprobe -b ch"
 SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe -b sg"
 SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe -b ppdev"