diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-11 13:11:06 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-11 13:11:06 +0100 |
| commit | a7964180e1d7ee8fbddd087ad45dbb96c23c8c1e (patch) | |
| tree | bf0d4e256df392564f50304d2d89fd56355d4023 /arch | |
| parent | ae33625512143ac277d96a26e1390c7935259373 (diff) | |
| parent | 5e11907b7b661a2c6ebe14ce10d3273f1d28fb8c (diff) | |
| download | barebox-a7964180e1d7ee8fbddd087ad45dbb96c23c8c1e.tar.gz barebox-a7964180e1d7ee8fbddd087ad45dbb96c23c8c1e.tar.xz | |
Merge branch 'for-next/gcc5'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap/include/mach/sys_info.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap/omap3_generic.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap/include/mach/sys_info.h b/arch/arm/mach-omap/include/mach/sys_info.h index fbac9b571f..e36f49df8a 100644 --- a/arch/arm/mach-omap/include/mach/sys_info.h +++ b/arch/arm/mach-omap/include/mach/sys_info.h @@ -90,7 +90,7 @@ u32 get_cpu_type(void); u32 get_cpu_rev(void); u32 get_sdr_cs_size(u32 offset); u32 get_sdr_cs1_base(void); -inline u32 get_sysboot_value(void); +u32 get_sysboot_value(void); u32 get_boot_type(void); u32 get_device_type(void); diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c index 5c29feaeb4..5327bad1aa 100644 --- a/arch/arm/mach-omap/omap3_generic.c +++ b/arch/arm/mach-omap/omap3_generic.c @@ -200,7 +200,7 @@ EXPORT_SYMBOL(get_sdr_cs1_base); * * @return - Return the value of SYSBOOT. */ -inline u32 get_sysboot_value(void) +u32 get_sysboot_value(void) { return (0x0000003F & readl(OMAP3_CONTROL_REG(STATUS))); } |