diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-01 09:37:04 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-01 09:37:04 +0200 |
| commit | 33a6e99a38bcb9f1bc698cf85fdc3d900dd30752 (patch) | |
| tree | dff4afac4d2e654f9f90269199e3205cbc6d13b1 /arch/arm/boards/pcm043 | |
| parent | 1e382ad1c4d92b3182c8e19dff2e4b715e2957d2 (diff) | |
| parent | 6bfd28dc178fdc5d6342607dc219dc0a6ef00e8e (diff) | |
| download | barebox-33a6e99a38bcb9f1bc698cf85fdc3d900dd30752.tar.gz barebox-33a6e99a38bcb9f1bc698cf85fdc3d900dd30752.tar.xz | |
Merge branch 'for-next/imx'
Conflicts:
drivers/usb/imx/chipidea-imx.c
Diffstat (limited to 'arch/arm/boards/pcm043')
| -rw-r--r-- | arch/arm/boards/pcm043/pcm043.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, |