From e99dc27e8cb924c66f941f769ea1b31e9c64daa4 Mon Sep 17 00:00:00 2001 From: Robert Marklund Date: Wed, 28 Sep 2011 09:59:06 +0200 Subject: mach-ux500: wlan: Add prefix to wlan board func Change-Id: I844d5b2a3021616f082adf496f88645f534a9382 Signed-off-by: Robert Marklund --- arch/arm/mach-ux500/board-u5500-wlan.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'arch') diff --git a/arch/arm/mach-ux500/board-u5500-wlan.c b/arch/arm/mach-ux500/board-u5500-wlan.c index 68282db06c3..8459ebd6aac 100644 --- a/arch/arm/mach-ux500/board-u5500-wlan.c +++ b/arch/arm/mach-ux500/board-u5500-wlan.c @@ -27,22 +27,22 @@ static struct resource cw1200_u5500_resources[] = { }, }; -static struct cw1200_platform_data cw1200_platform_data = { 0 }; +static struct cw1200_platform_data cw1200_u5500_platform_data = { 0 }; static struct platform_device cw1200_device = { .name = "cw1200_wlan", .dev = { - .platform_data = &cw1200_platform_data, + .platform_data = &cw1200_u5500_platform_data, .release = cw1200_release, .init_name = "cw1200_wlan", }, }; -const struct cw1200_platform_data *cw1200_get_platform_data(void) +const struct cw1200_platform_data *cw1200_u5500_get_platform_data(void) { - return &cw1200_platform_data; + return &cw1200_u5500_platform_data; } -EXPORT_SYMBOL_GPL(cw1200_get_platform_data); +EXPORT_SYMBOL_GPL(cw1200_u5500_get_platform_data); static int cw1200_pins_enable(bool enable) { @@ -87,8 +87,8 @@ int __init u5500_wlan_init(void) return -ENOTSUPP; } - cw1200_platform_data.mmc_id = "mmc2"; - cw1200_platform_data.irq = &cw1200_device.resource[0]; + cw1200_u5500_platform_data.mmc_id = "mmc2"; + cw1200_u5500_platform_data.irq = &cw1200_device.resource[0]; cw1200_device.dev.release = cw1200_release; -- cgit v1.2.3