diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:38:17 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:38:17 +0200 |
| commit | 18ea2863bf76d6cd81c83706b5eb180dc5ad23bc (patch) | |
| tree | ae51ca9e03b538a58c576e1fa79983ec31e22269 /arch/arm/mach-omap/include/mach/omap3-generic.h | |
| parent | c408a4ecbee60a9d512930972c09c6f9e365a671 (diff) | |
| parent | 893f30f614da5ed132265f5c4da767ec26a8edf5 (diff) | |
| download | barebox-18ea2863bf76d6cd81c83706b5eb180dc5ad23bc.tar.gz barebox-18ea2863bf76d6cd81c83706b5eb180dc5ad23bc.tar.xz | |
Merge branch 'for-next/omap'
Conflicts:
arch/arm/boards/beagle/board.c
Diffstat (limited to 'arch/arm/mach-omap/include/mach/omap3-generic.h')
| -rw-r--r-- | arch/arm/mach-omap/include/mach/omap3-generic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap/include/mach/omap3-generic.h b/arch/arm/mach-omap/include/mach/omap3-generic.h index 7db0838a5f..ab53b98971 100644 --- a/arch/arm/mach-omap/include/mach/omap3-generic.h +++ b/arch/arm/mach-omap/include/mach/omap3-generic.h @@ -29,4 +29,6 @@ void __noreturn omap3_reset_cpu(unsigned long addr); int omap3_init(void); int omap3_devices_init(void); +void *omap3_xload_boot_usb(void); + #endif /* __MACH_OMAP3_GENERIC_H */ |