diff --git a/[refs] b/[refs] index 7960b54719d7..e50922f2852d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7657ec1fcb69e266ab876af56332d0c484ca6d00 +refs/heads/master: a45f105ad4b456f99f622642056ae533f70710b7 diff --git a/trunk/drivers/w1/w1.h b/trunk/drivers/w1/w1.h index 6cc7f0c5d434..d8900780c3bf 100644 --- a/trunk/drivers/w1/w1.h +++ b/trunk/drivers/w1/w1.h @@ -75,6 +75,7 @@ struct w1_slave struct w1_master *master; struct w1_family *family; + void *family_data; struct device dev; struct completion released; };