diff --git a/[refs] b/[refs] index d055739b3cbd..30e4ffaed880 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f772ed8df27c6941952452330c618512389c4c7 +refs/heads/master: 5e8eb8501212eb92826ccf191f9ca8c186f531c3 diff --git a/trunk/drivers/w1/w1.c b/trunk/drivers/w1/w1.c index 9c7777b6bbdc..b2fe0f7b0b7c 100644 --- a/trunk/drivers/w1/w1.c +++ b/trunk/drivers/w1/w1.c @@ -373,7 +373,7 @@ static int w1_hotplug(struct device *dev, char **envp, int num_envp, char *buffe if (err) return err; - err = add_hotplug_env_var(envp, num_envp, &cur_index, buffer, buffer_size, &cur_len, "W1_SLAVE_ID=%024llX", sl->reg_num.id); + err = add_hotplug_env_var(envp, num_envp, &cur_index, buffer, buffer_size, &cur_len, "W1_SLAVE_ID=%024LX", (u64)sl->reg_num.id); if (err) return err;