diff --git a/[refs] b/[refs] index 8a42e0142e78..473956f498f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ee074bf432d24a92894397ac48ad2f2bb95efdc +refs/heads/master: 7fb6b5d51daf3613045258ee8add07022d8c39d3 diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h index 246937c9cbc7..60f6456691a6 100644 --- a/trunk/include/linux/device.h +++ b/trunk/include/linux/device.h @@ -502,7 +502,6 @@ extern struct device *device_create(struct class *cls, struct device *parent, dev_t devt, void *drvdata, const char *fmt, ...) __attribute__((format(printf, 5, 6))); -#define device_create_drvdata device_create extern void device_destroy(struct class *cls, dev_t devt); /*