Merge tag 'v3.9-rc3' into next
Merge with mainline to bring in module_platform_driver_probe() and devm_ioremap_resource().
Šī revīzija ir iekļauta:
@@ -50,8 +50,8 @@ static void devres_log(struct device *dev, struct devres_node *node,
|
||||
const char *op)
|
||||
{
|
||||
if (unlikely(log_devres))
|
||||
dev_printk(KERN_ERR, dev, "DEVRES %3s %p %s (%lu bytes)\n",
|
||||
op, node, node->name, (unsigned long)node->size);
|
||||
dev_err(dev, "DEVRES %3s %p %s (%lu bytes)\n",
|
||||
op, node, node->name, (unsigned long)node->size);
|
||||
}
|
||||
#else /* CONFIG_DEBUG_DEVRES */
|
||||
#define set_node_dbginfo(node, n, s) do {} while (0)
|
||||
|
Atsaukties uz šo jaunā problēmā
Block a user