diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-23 23:25:13 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-24 08:34:26 +0200 |
| commit | a6375f6e454e117ef8c8d323a21613afab035c06 (patch) | |
| tree | f4f2e152f2b86abe50a5c1d9066c75c253b8d3d4 /arch | |
| parent | eea62cd7d7ee89211e6b6842530559ba343a9b74 (diff) | |
| download | barebox-a6375f6e454e117ef8c8d323a21613afab035c06.tar.gz barebox-a6375f6e454e117ef8c8d323a21613afab035c06.tar.xz | |
ARM: i.MX: rename initcall functions
Some boards use function names locally which we introduce as
global functions in the next patch. Rename them to avoid
'static declaration follows non-static declaration' errors.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/freescale-mx25-3-stack/3stack.c | 4 | ||||
| -rw-r--r-- | arch/arm/boards/pcm037/pcm037.c | 4 | ||||
| -rw-r--r-- | arch/arm/boards/pcm043/pcm043.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boards/freescale-mx25-3-stack/3stack.c b/arch/arm/boards/freescale-mx25-3-stack/3stack.c index ea4d4ba4f4..6620a86770 100644 --- a/arch/arm/boards/freescale-mx25-3-stack/3stack.c +++ b/arch/arm/boards/freescale-mx25-3-stack/3stack.c @@ -186,7 +186,7 @@ static int imx25_3ds_fec_init(void) } late_initcall(imx25_3ds_fec_init); -static int imx25_devices_init(void) +static int imx25_3ds_devices_init(void) { #ifdef CONFIG_USB /* USB does not work yet. Don't know why. Maybe @@ -222,7 +222,7 @@ static int imx25_devices_init(void) return 0; } -device_initcall(imx25_devices_init); +device_initcall(imx25_3ds_devices_init); static iomux_v3_cfg_t imx25_pads[] = { MX25_PAD_FEC_MDC__FEC_MDC, diff --git a/arch/arm/boards/pcm037/pcm037.c b/arch/arm/boards/pcm037/pcm037.c index 9361a9d523..de83c99b93 100644 --- a/arch/arm/boards/pcm037/pcm037.c +++ b/arch/arm/boards/pcm037/pcm037.c @@ -146,7 +146,7 @@ static struct smc911x_plat smsc9217_pdata = { .flags = SMC911X_FORCE_INTERNAL_PHY, }; -static int imx31_devices_init(void) +static int pcm037_devices_init(void) { /* CS0: Nor Flash */ imx31_setup_weimcs(0, 0x0000cf03, 0x10000d03, 0x00720900); @@ -202,7 +202,7 @@ static int imx31_devices_init(void) return 0; } -device_initcall(imx31_devices_init); +device_initcall(pcm037_devices_init); static unsigned int pcm037_iomux[] = { /* UART1 */ diff --git a/arch/arm/boards/pcm043/pcm043.c b/arch/arm/boards/pcm043/pcm043.c index b2726dffc8..68b7864aa1 100644 --- a/arch/arm/boards/pcm043/pcm043.c +++ b/arch/arm/boards/pcm043/pcm043.c @@ -113,7 +113,7 @@ struct gpio_led led0 = { .gpio = 1 * 32 + 6, }; -static int imx35_devices_init(void) +static int pcm043_devices_init(void) { uint32_t reg; char *envstr; @@ -173,7 +173,7 @@ static int imx35_devices_init(void) return 0; } -device_initcall(imx35_devices_init); +device_initcall(pcm043_devices_init); static iomux_v3_cfg_t pcm043_pads[] = { MX35_PAD_FEC_TX_CLK__FEC_TX_CLK, |