diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-11-08 18:32:24 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-11-08 18:32:24 +0100 |
| commit | 91e43395820baad80248987608216c35da9df65b (patch) | |
| tree | 29d41d1a036eb1abd6a60f16ad37aa578acd8159 /arch/mips/ar7/memory.c | |
| parent | ARM: OMAP2+: prm44xx: Fix section annotation on omap44xx_prm_enable_io_wakeup (diff) | |
| parent | ARM: OMAP1: ams-delta: Fix possible use of uninitialized field (diff) | |
| download | linux-91e43395820baad80248987608216c35da9df65b.tar.xz linux-91e43395820baad80248987608216c35da9df65b.zip | |
Merge branch 'fixes-dts' into omap-for-v4.20/fixes
Diffstat (limited to 'arch/mips/ar7/memory.c')
| -rw-r--r-- | arch/mips/ar7/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ar7/memory.c b/arch/mips/ar7/memory.c index 0332f0514d05..80390a9ec264 100644 --- a/arch/mips/ar7/memory.c +++ b/arch/mips/ar7/memory.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <linux/bootmem.h> +#include <linux/memblock.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/pfn.h> |