diff --git a/[refs] b/[refs] index 4b7c8d0dcc2a..532a719d01d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01eaf2458773b276e219a48df69351d230c63d0b +refs/heads/master: 679012655acecfa807038ccf9237bba246f9fad8 diff --git a/trunk/drivers/w1/w1_int.c b/trunk/drivers/w1/w1_int.c index 531434180afd..5a98649f6abc 100644 --- a/trunk/drivers/w1/w1_int.c +++ b/trunk/drivers/w1/w1_int.c @@ -118,7 +118,7 @@ int w1_add_master_device(struct w1_bus_master *master) return(-EINVAL); } /* While it would be electrically possible to make a device that - * generated a strong pullup in bit bang mode, only hardare that + * generated a strong pullup in bit bang mode, only hardware that * controls 1-wire time frames are even expected to support a strong * pullup. w1_io.c would need to support calling set_pullup before * the last write_bit operation of a w1_write_8 which it currently