From c2f4bad86bd77de512dcf9b6b09d575797b37a95 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Tue, 6 Sep 2011 16:27:01 +0800 Subject: [PATCH] rk29: ddr3sdk: fix warning: android_pmem: probe of android_pmem.3 failed with error -1 --- arch/arm/mach-rk29/board-rk29-ddr3sdk.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c index 92b6c95e9bb7..3cc9040611fb 100755 --- a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c +++ b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c @@ -125,7 +125,7 @@ #define MEM_CAMIPP_BASE (PMEM_CAM_BASE - MEM_CAMIPP_SIZE) #define MEM_FB_BASE (MEM_CAMIPP_BASE - MEM_FB_SIZE) #define MEM_FBIPP_BASE (MEM_FB_BASE - MEM_FBIPP_SIZE) -#define PMEM_SKYPE_BASE (MEM_FBIPP_BASE - PMEM_SKYPE_SIZE) +#define PMEM_SKYPE_BASE (MEM_FBIPP_BASE - PMEM_SKYPE_SIZE) #define LINUX_SIZE (PMEM_SKYPE_BASE - RK29_SDRAM_PHYS) #define PREALLOC_WLAN_SEC_NUM 4 @@ -781,6 +781,8 @@ static struct platform_device rk29_vpu_mem_device = { .platform_data = &vpu_mem_pdata, }, }; + +#if PMEM_SKYPE_SIZE > 0 static struct android_pmem_platform_data android_pmem_skype_pdata = { .name = "pmem_skype", .start = PMEM_SKYPE_BASE, @@ -796,6 +798,8 @@ static struct platform_device android_pmem_skype_device = { .platform_data = &android_pmem_skype_pdata, }, }; +#endif + #ifdef CONFIG_VIDEO_RK29XX_VOUT static struct platform_device rk29_v4l2_output_devce = { .name = "rk29_vout", @@ -2036,7 +2040,9 @@ static struct platform_device *devices[] __initdata = { &rk29_soc_camera_pdrv_1, &android_pmem_cam_device, #endif - &android_pmem_skype_device, +#if PMEM_SKYPE_SIZE > 0 + &android_pmem_skype_device, +#endif &android_pmem_device, &rk29_vpu_mem_device, #ifdef CONFIG_USB20_OTG -- 2.34.1