diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-24 13:52:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-24 13:52:02 -0800 |
| commit | 228a65d4544af5086bd167dcc5a0cb4fae2c42b4 (patch) | |
| tree | 3950a4f6f428c3cd06f4be67cd16f8e88a98bf51 /arch/sh/include/asm | |
| parent | Merge tag 'io_uring-5.11-2021-01-24' of git://git.kernel.dk/linux-block (diff) | |
| parent | sh/intc: Restore devm_ioremap() alignment (diff) | |
| download | linux-dev-228a65d4544af5086bd167dcc5a0cb4fae2c42b4.tar.xz linux-dev-228a65d4544af5086bd167dcc5a0cb4fae2c42b4.zip | |
Merge tag 'sh-for-5.11' of git://git.libc.org/linux-sh
Pull arch/sh updates from Rich Felker:
"Cleanup and warning fixes"
* tag 'sh-for-5.11' of git://git.libc.org/linux-sh:
sh/intc: Restore devm_ioremap() alignment
sh: mach-sh03: remove duplicate include
arch: sh: remove duplicate include
sh: Drop ARCH_NR_GPIOS definition
sh: Remove unused HAVE_COPY_THREAD_TLS macro
sh: remove CONFIG_IDE from most defconfig
sh: mm: Convert to DEFINE_SHOW_ATTRIBUTE
sh: intc: Convert to DEFINE_SHOW_ATTRIBUTE
arch/sh: hyphenate Non-Uniform in Kconfig prompt
sh: dma: fix kconfig dependency for G2_DMA
Diffstat (limited to 'arch/sh/include/asm')
| -rw-r--r-- | arch/sh/include/asm/gpio.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/include/asm/gpio.h b/arch/sh/include/asm/gpio.h index 351918894e86..d643250f0a0f 100644 --- a/arch/sh/include/asm/gpio.h +++ b/arch/sh/include/asm/gpio.h @@ -16,7 +16,6 @@ #include <cpu/gpio.h> #endif -#define ARCH_NR_GPIOS 512 #include <asm-generic/gpio.h> #ifdef CONFIG_GPIOLIB |