Merge branch 'next'

Signed-off-by: Tom Rini <trini@konsulko.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/demo/demo-pdata.c b/drivers/demo/demo-pdata.c
index 2f434f8db01..818f77503a3 100644
--- a/drivers/demo/demo-pdata.c
+++ b/drivers/demo/demo-pdata.c
@@ -20,27 +20,27 @@ static const struct dm_demo_pdata yellow_hexagon = {
 	.sides = 6.
 };
 
-U_BOOT_DEVICE(demo0) = {
+U_BOOT_DRVINFO(demo0) = {
 	.name = "demo_shape_drv",
-	.platdata = &red_square,
+	.plat = &red_square,
 };
 
-U_BOOT_DEVICE(demo1) = {
+U_BOOT_DRVINFO(demo1) = {
 	.name = "demo_simple_drv",
-	.platdata = &red_square,
+	.plat = &red_square,
 };
 
-U_BOOT_DEVICE(demo2) = {
+U_BOOT_DRVINFO(demo2) = {
 	.name = "demo_shape_drv",
-	.platdata = &green_triangle,
+	.plat = &green_triangle,
 };
 
-U_BOOT_DEVICE(demo3) = {
+U_BOOT_DRVINFO(demo3) = {
 	.name = "demo_simple_drv",
-	.platdata = &yellow_hexagon,
+	.plat = &yellow_hexagon,
 };
 
-U_BOOT_DEVICE(demo4) = {
+U_BOOT_DRVINFO(demo4) = {
 	.name = "demo_shape_drv",
-	.platdata = &yellow_hexagon,
+	.plat = &yellow_hexagon,
 };