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/configs/sh03_defconfig | |
parent | ef7b1a0ea857af076ea64d131e95b59166ab6163 (diff) | |
parent | b89bc060b53e7054e5c8ca11feea4bc884d83611 (diff) | |
download | linux-228a65d4544af5086bd167dcc5a0cb4fae2c42b4.tar.bz2 |
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/configs/sh03_defconfig')
-rw-r--r-- | arch/sh/configs/sh03_defconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sh/configs/sh03_defconfig b/arch/sh/configs/sh03_defconfig index f0073ed39947..48b457d59e79 100644 --- a/arch/sh/configs/sh03_defconfig +++ b/arch/sh/configs/sh03_defconfig @@ -39,9 +39,6 @@ CONFIG_IP_PNP_RARP=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=y CONFIG_BLK_DEV_RAM=y -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDETAPE=m CONFIG_SCSI=m CONFIG_BLK_DEV_SD=m CONFIG_BLK_DEV_SR=m |