The patch titled
     w1: allow bus master to have reset and byte ops
has been removed from the -mm tree.  Its filename was
     w1-allow-bus-master-to-have-reset-and-byte-ops.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: w1: allow bus master to have reset and byte ops
From: Evgeniy Polyakov <[EMAIL PROTECTED]>

Signed-off-by: Matt Reimer <[EMAIL PROTECTED]>
Signed-off-by: Evgeniy Polyakov <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 drivers/w1/w1_int.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN drivers/w1/w1_int.c~w1-allow-bus-master-to-have-reset-and-byte-ops 
drivers/w1/w1_int.c
--- a/drivers/w1/w1_int.c~w1-allow-bus-master-to-have-reset-and-byte-ops
+++ a/drivers/w1/w1_int.c
@@ -100,7 +100,8 @@ int w1_add_master_device(struct w1_bus_m
 
         /* validate minimum functionality */
         if (!(master->touch_bit && master->reset_bus) &&
-            !(master->write_bit && master->read_bit)) {
+            !(master->write_bit && master->read_bit) &&
+           !(master->write_byte && master->read_byte && master->reset_bus)) {
                printk(KERN_ERR "w1_add_master_device: invalid function set\n");
                return(-EINVAL);
         }
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
git-battery.patch
use-menuconfig-objects-connector.patch
use-menuconfig-objects-w1.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to