diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:11:48 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:11:48 +0200 |
commit | bee8dddbfcb07de469105a660e426fa132f96b6a (patch) | |
tree | 11568bb2d8fa6cbbdc1b468093b5202eb5bcddeb /arch/arm/mach-omap/include/mach/xload.h | |
parent | d8b30e6c3823bfe50c3e060aab39b0fab2de933f (diff) | |
parent | 93ca711e64d7a4d79aee15b4ce415688f5415fda (diff) | |
download | barebox-bee8dddbfcb07de469105a660e426fa132f96b6a.tar.gz barebox-bee8dddbfcb07de469105a660e426fa132f96b6a.tar.xz |
Merge branch 'for-next/omap'
Conflicts:
Makefile
Diffstat (limited to 'arch/arm/mach-omap/include/mach/xload.h')
-rw-r--r-- | arch/arm/mach-omap/include/mach/xload.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-omap/include/mach/xload.h b/arch/arm/mach-omap/include/mach/xload.h index 844b57f0e5..63b68df15c 100644 --- a/arch/arm/mach-omap/include/mach/xload.h +++ b/arch/arm/mach-omap/include/mach/xload.h @@ -1,13 +1,11 @@ #ifndef _MACH_XLOAD_H #define _MACH_XLOAD_H -void *omap_xload_boot_nand(int offset, int size); -void *omap_xload_boot_mmc(void); - enum omap_boot_src { OMAP_BOOTSRC_UNKNOWN, OMAP_BOOTSRC_MMC1, OMAP_BOOTSRC_NAND, + OMAP_BOOTSRC_SPI1, }; enum omap_boot_src omap3_bootsrc(void); |