diff options
| author | Olof Johansson <olof@lixom.net> | 2018-12-12 13:58:34 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-12-12 13:58:34 -0800 |
| commit | 4238973b2ecd84412d78cc72c4ab3bdae064f2e8 (patch) | |
| tree | cc0421796b62da12b5eb65452d46053da6a36f83 /arch/arm/mach-omap2 | |
| parent | 4dd201beec9512c44d11ac97791a33f5c3536d7b (diff) | |
| parent | 5a87809b89b64c0ccd82261de53c41f2fffb56da (diff) | |
Merge tag 'omap-for-v4.21/omap1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
Changes for omap1 variants for v4.21 merge window
In this set of changes Aaro Koskinen revives Palm Tungsten E for the
MMC and USB making it usable again. And Janusz Krzysztofik follows up
on the clean-up of ams-delta GPIO handling. The other changes are
clean-up for DEFINE_SHOW_ATTRIBUTE by Yangtao Li.
* tag 'omap-for-v4.21/omap1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP1: fix USB configuration for device-only setups
ARM: OMAP1: add MMC configuration for Palm Tungsten E
ARM: OMAP1: devices: configure omap1_spi100k only on OMAP7xx
ARM: OMAP1/2: fix SoC name printing
ARM: OMAP1: ams-delta: Move AMS_DELTA_LATCH2_NGPIO to the board file
ARM: OMAP1: ams-delta: Drop unused symbols from the board header
ARM: OMAP1: ams-delta: Drop board specific global GPIO numbers
ARM: OMAP: PM: Change to use DEFINE_SHOW_ATTRIBUTE macro
ARM: OMAP1: clock: Change to use DEFINE_SHOW_ATTRIBUTE macro
ARM: OMAP1: ams-delta: Provide GPIO lookup table for LED device
ARM: OMAP1: ams-delta: make board header file local to mach-omap1
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/id.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 68ba5f472f6b..859c71c4e932 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -199,8 +199,8 @@ void __init omap2xxx_check_revision(void) pr_info("%s", soc_name); if ((omap_rev() >> 8) & 0x0f) - pr_info("%s", soc_rev); - pr_info("\n"); + pr_cont("%s", soc_rev); + pr_cont("\n"); } #define OMAP3_SHOW_FEATURE(feat) \ |