diff --git a/Makefile b/Makefile index 397c54a..b72ff85 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VERSION = 2013 PATCHLEVEL = 08 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = NAME = Just married Maintainer diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c index 4bc4a99..9d75d0c 100644 --- a/drivers/mtd/ubi/cdev.c +++ b/drivers/mtd/ubi/cdev.c @@ -23,7 +23,7 @@ loff_t offp = offset; int usable_leb_size = vol->usable_leb_size; - printf("%s: %zd @ 0x%08llx\n", __func__, size, offset); + pr_debug("%s: %zd @ 0x%08llx\n", __func__, size, offset); len = size > usable_leb_size ? usable_leb_size : size; diff --git a/drivers/of/base.c b/drivers/of/base.c index 881ac3b..a1bf671 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1979,7 +1979,7 @@ struct device_node *chosen; __be32 buf[2]; - chosen = of_find_node_by_path("/chosen"); + chosen = of_find_node_by_path_from(root, "/chosen"); if (!chosen) return -EINVAL;