diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-26 22:47:55 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-26 22:47:55 -0500 |
| commit | 0da90255083681a02b24528f80da9d4062ff634a (patch) | |
| tree | 3046fb2c4824adaf891d0356e024da0dd0b2398f /arch/arm/mach-omap2/boot-common.c | |
| parent | 87f78478a4a1bf574db0b0e575ca37cf91fb187c (diff) | |
| parent | 320194ae35801811bd7754f23ac04bd841d25aa3 (diff) | |
Merge branch '2019-01-25-master-imports'
- snapdragon 820c improvements
- poplar updates
- DFU + SPL cleanups
- Improve the mediatek mmc driver
- Other minor cleanups / improvements
Diffstat (limited to 'arch/arm/mach-omap2/boot-common.c')
| -rw-r--r-- | arch/arm/mach-omap2/boot-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index 176d4f67cbb..2db19227b92 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -108,7 +108,7 @@ void save_omap_boot_params(void) sys_boot_device = 1; break; #endif -#if defined(BOOT_DEVICE_DFU) && !defined(CONFIG_SPL_DFU_SUPPORT) +#if defined(BOOT_DEVICE_DFU) && !defined(CONFIG_SPL_DFU) case BOOT_DEVICE_DFU: sys_boot_device = 1; break; |