diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-15 13:43:01 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-15 13:43:01 +0100 |
commit | cbc25b2b8488452085d3195dfc7164b00a265364 (patch) | |
tree | 41a9dd36d0115407c11c001899ea28fa807ad82b /arch/mips/mach-ath79/include/mach/pbl_macros.h | |
parent | bc099cbdb0e1c70fe220b88754e07e002c9c5511 (diff) | |
parent | 3d347644f53873b93dd85752e039f7a95a3e175a (diff) | |
download | barebox-cbc25b2b8488452085d3195dfc7164b00a265364.tar.gz barebox-cbc25b2b8488452085d3195dfc7164b00a265364.tar.xz |
Merge branch 'for-next/mips'
Diffstat (limited to 'arch/mips/mach-ath79/include/mach/pbl_macros.h')
-rw-r--r-- | arch/mips/mach-ath79/include/mach/pbl_macros.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/mips/mach-ath79/include/mach/pbl_macros.h b/arch/mips/mach-ath79/include/mach/pbl_macros.h index 906d73e8c7..70736b3680 100644 --- a/arch/mips/mach-ath79/include/mach/pbl_macros.h +++ b/arch/mips/mach-ath79/include/mach/pbl_macros.h @@ -393,13 +393,10 @@ skip_pll_ram_config: dcache_enable pbl_ar9331_uart_enable - debug_ll_ar9331_init - mips_nmon + debug_ll_ath79_init pbl_ar9331_mdio_gpio_enable - copy_to_link_location pbl_start - .set pop .endm |