2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 07:04:00 +08:00
linux-next/arch/m68k/atari
Geert Uytterhoeven 053b514295 m68k: atari: Rename shifter to shifter_st to avoid conflict
When test-compiling the BCM2835 pin control driver on m68k:

    In file included from arch/m68k/include/asm/io_mm.h:32:0,
                     from arch/m68k/include/asm/io.h:8,
                     from include/linux/io.h:13,
                     from include/linux/irq.h:20,
                     from include/linux/gpio/driver.h:7,
                     from drivers/pinctrl/bcm/pinctrl-bcm2835.c:17:
    drivers/pinctrl/bcm/pinctrl-bcm2835.c: In function 'bcm2711_pull_config_set':
    arch/m68k/include/asm/atarihw.h:190:22: error: expected identifier or '(' before 'volatile'
     # define shifter ((*(volatile struct SHIFTER *)SHF_BAS))

"shifter" is a too generic name for a global definition.

As the corresponding definition for Atari TT is already called
"shifter_tt", fix this by renaming the definition for Atari ST to
"shifter_st".

Reported-by: kbuild test robot <lkp@intel.com>
Suggested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
2019-08-19 13:24:10 +02:00
..
ataints.c m68k: Call timer_interrupt() with interrupts disabled 2019-03-25 10:22:24 +01:00
atakeyb.c m68k/atari: Modernize printing of kernel messages 2017-02-12 10:36:49 +01:00
atasound.c Disintegrate asm/system.h for M68K 2012-03-28 18:30:02 +01:00
config.c m68k: atari: Rename shifter to shifter_st to avoid conflict 2019-08-19 13:24:10 +02:00
debug.c m68k/amiga,atari: Fix specifying multiple debug= parameters 2013-12-08 11:03:21 +01:00
Makefile treewide: Add SPDX license identifier - Makefile/Kconfig 2019-05-21 10:50:46 +02:00
nvram.c m68k: Dispatch nvram_ops calls to Atari or Mac functions 2019-01-22 10:21:45 +01:00
stdma.c m68k/atari: Remove obsolete IRQ_TYPE_* 2015-01-15 13:44:51 +01:00
stram.c treewide: add checks for the return value of memblock_alloc*() 2019-03-12 10:04:02 -07:00
time.c m68k: atari: Convert to clocksource API 2019-03-25 10:22:24 +01:00