diff --git a/[refs] b/[refs] index de8fd31ff61b..c26df86d3f8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ef97dd7a8721882732ea8041fc07c80be3882ba +refs/heads/master: 24d10f0c37d301e88f6965e3dc0aa684311544e5 diff --git a/trunk/include/linux/maple.h b/trunk/include/linux/maple.h index 3f01e2bae1a1..d31e36ebb436 100644 --- a/trunk/include/linux/maple.h +++ b/trunk/include/linux/maple.h @@ -64,7 +64,6 @@ struct maple_driver { int (*connect) (struct maple_device * dev); void (*disconnect) (struct maple_device * dev); struct device_driver drv; - int registered; }; void maple_getcond_callback(struct maple_device *dev,