diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 15:15:55 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 15:16:04 -0400 |
commit | 7d1206bc2859c6e9f46e35ae697c138e7d7858a7 (patch) | |
tree | 14af84e9a635e59293edf81aa562b6740c57d310 /arch/arm/mach-omap2/board-cm-t3517.c | |
parent | f4eb28340771c12cdbf8b5ec149dbd3b0eef1687 (diff) | |
parent | c899445f9783309ac73073282d4c0ae27f51fa9a (diff) |
Merge branch 'kirkwood/dt' into next/dt2
This was part of the for-next branch earlier but for some reasons
a rebuild of the tree missed it, so I'm putting it back in now.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/board-cm-t3517.c')
-rw-r--r-- | arch/arm/mach-omap2/board-cm-t3517.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t3517.c b/arch/arm/mach-omap2/board-cm-t3517.c index f36d694d2159..9e66e167e4f3 100644 --- a/arch/arm/mach-omap2/board-cm-t3517.c +++ b/arch/arm/mach-omap2/board-cm-t3517.c | |||
@@ -49,6 +49,7 @@ | |||
49 | #include "mux.h" | 49 | #include "mux.h" |
50 | #include "control.h" | 50 | #include "control.h" |
51 | #include "common-board-devices.h" | 51 | #include "common-board-devices.h" |
52 | #include "am35xx-emac.h" | ||
52 | 53 | ||
53 | #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) | 54 | #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) |
54 | static struct gpio_led cm_t3517_leds[] = { | 55 | static struct gpio_led cm_t3517_leds[] = { |
@@ -291,6 +292,7 @@ static void __init cm_t3517_init(void) | |||
291 | cm_t3517_init_rtc(); | 292 | cm_t3517_init_rtc(); |
292 | cm_t3517_init_usbh(); | 293 | cm_t3517_init_usbh(); |
293 | cm_t3517_init_hecc(); | 294 | cm_t3517_init_hecc(); |
295 | am35xx_emac_init(AM35XX_DEFAULT_MDIO_FREQUENCY, 1); | ||
294 | } | 296 | } |
295 | 297 | ||
296 | MACHINE_START(CM_T3517, "Compulab CM-T3517") | 298 | MACHINE_START(CM_T3517, "Compulab CM-T3517") |