diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-09-28 10:00:08 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 15:09:37 +0200 |
| commit | 46965ef9f01ffa5239ecb110f8bc97e90737387a (patch) | |
| tree | 8a945aa429024adab36ed6a0fe1ec85a621b9e16 | |
| parent | e99dc27e8cb924c66f941f769ea1b31e9c64daa4 (diff) | |
mach-ux500: mcde: Add prefix to mcde board func
Change-Id: Ia0e4f9ba5df5fe369df61dc1b843811990834e09
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500-mcde.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-ux500/board-u5500-mcde.c b/arch/arm/mach-ux500/board-u5500-mcde.c index 581ecc700de..25bcc14dadd 100644 --- a/arch/arm/mach-ux500/board-u5500-mcde.c +++ b/arch/arm/mach-ux500/board-u5500-mcde.c @@ -141,7 +141,6 @@ struct mcde_display_device generic_display0 = { }; #endif /* CONFIG_DISPLAY_GENERIC_DSI_PRIMARY */ -#ifdef CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY static struct mcde_port port1 = { .type = MCDE_PORTTYPE_DSI, .mode = MCDE_PORTMODE_CMD, @@ -206,7 +205,6 @@ struct mcde_display_device sony_acx424akp_display0 = { .platform_data = &sony_acx424akp_display0_pdata, }, }; -#endif /* CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY */ #ifdef CONFIG_DISPLAY_AV8100_TERTIARY static struct mcde_port port2 = { @@ -480,7 +478,7 @@ static struct notifier_block framebuffer_nb = { .notifier_call = framebuffer_postregistered_callback, }; -int __init init_display_devices(void) +int __init init_u5500_display_devices(void) { int ret = 0; @@ -529,7 +527,7 @@ int __init init_display_devices(void) return ret; } -struct mcde_display_device *mcde_get_main_display(void) +struct mcde_display_device *mcde_u5500_get_main_display(void) { #if defined(CONFIG_DISPLAY_GENERIC_DSI_PRIMARY) || \ defined(CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY) @@ -542,7 +540,7 @@ struct mcde_display_device *mcde_get_main_display(void) #endif return NULL; } -EXPORT_SYMBOL(mcde_get_main_display); +EXPORT_SYMBOL(mcde_u5500_get_main_display); -module_init(init_display_devices); +module_init(init_u5500_display_devices); #endif |