From cd84d3ade85970bc266a244a954d38d4328f3b29 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Fri, 2 Aug 2013 10:17:16 +0800 Subject: [PATCH] rk3026: devices.c: rename device_vpu_service to device_vpu, prevent duplicate add device --- arch/arm/mach-rk2928/devices.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-rk2928/devices.c b/arch/arm/mach-rk2928/devices.c index 78b3c9dacd64..958b55dd2cb6 100644 --- a/arch/arm/mach-rk2928/devices.c +++ b/arch/arm/mach-rk2928/devices.c @@ -819,7 +819,7 @@ static struct platform_device device_lvds = { }; #endif -static struct resource resource_vpu_service[] = { +static struct resource resource_vpu[] = { { .start = IRQ_VDPU, .end = IRQ_VDPU, @@ -839,11 +839,11 @@ static struct resource resource_vpu_service[] = { }, }; -static struct platform_device device_vpu_service = { - .name = "vpu_service", +static struct platform_device device_vpu = { + .name = "vpu", .id = -1, - .num_resources = ARRAY_SIZE(resource_vpu_service), - .resource = resource_vpu_service, + .num_resources = ARRAY_SIZE(resource_vpu), + .resource = resource_vpu, }; static int __init rk2928_init_devices(void) @@ -880,7 +880,7 @@ static int __init rk2928_init_devices(void) #ifdef CONFIG_RK3026_LVDS platform_device_register(&device_lvds); #endif - platform_device_register(&device_vpu_service); + platform_device_register(&device_vpu); return 0; } -- 2.34.1