diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-15 13:43:03 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-15 13:43:03 +0100 |
| commit | 358959c256a46dd0c53ae0855e957ccfd2660a51 (patch) | |
| tree | bf545a1788bdf3e64d2c71d9365f083ee9c4a571 /arch/arm/mach-omap | |
| parent | 7c2517c2444fdd5c2eceee330a03ff15d12602ca (diff) | |
| parent | de8466c986f245b662305dd4f8cef8bae2a3fe46 (diff) | |
| download | barebox-358959c256a46dd0c53ae0855e957ccfd2660a51.tar.gz barebox-358959c256a46dd0c53ae0855e957ccfd2660a51.tar.xz | |
Merge branch 'for-next/missing-prototypes'
Diffstat (limited to 'arch/arm/mach-omap')
| -rw-r--r-- | arch/arm/mach-omap/include/mach/omap4-generic.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap/omap4_generic.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap/include/mach/omap4-generic.h b/arch/arm/mach-omap/include/mach/omap4-generic.h index 7ec41d880b..c1d0a3c900 100644 --- a/arch/arm/mach-omap/include/mach/omap4-generic.h +++ b/arch/arm/mach-omap/include/mach/omap4-generic.h @@ -1,6 +1,7 @@ #ifndef __MACH_OMAP4_GENERIC_H #define __MACH_OMAP4_GENERIC_H +#include <linux/sizes.h> #include <mach/generic.h> #include <mach/omap4-silicon.h> diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c index c7b6e513a2..1f71153848 100644 --- a/arch/arm/mach-omap/omap4_generic.c +++ b/arch/arm/mach-omap/omap4_generic.c @@ -10,6 +10,7 @@ #include <mach/generic.h> #include <mach/gpmc.h> #include <mach/omap4_rom_usb.h> +#include <mach/omap4-generic.h> /* * The following several lines are taken from U-Boot to support @@ -179,7 +180,7 @@ static inline void delay(unsigned long loops) "bne 1b" : "=r" (loops) : "0"(loops)); } -int omap4_emif_config(unsigned int base, const struct ddr_regs *ddr_regs) +static int omap4_emif_config(unsigned int base, const struct ddr_regs *ddr_regs) { /* * set SDRAM CONFIG register |