Commit 228a65d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ef7b1a0e b89bc060

arch/sh/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ config SUPERH 
	select HAVE_ARCH_KGDB

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_COPY_THREAD_TLS

	select HAVE_DEBUG_BUGVERBOSE

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DYNAMIC_FTRACE

arch/sh/boards/mach-sh03/rtc.c

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/sched.h>

#include <linux/time.h>

#include <linux/bcd.h>

#include <linux/rtc.h>

#include <linux/spinlock.h>

#include <linux/io.h>

#include <linux/rtc.h>

arch/sh/configs/landisk_defconfig

+4 −5
Original line number Diff line number Diff line
@@ -27,13 +27,12 @@ CONFIG_NETFILTER=y 
CONFIG_ATALK=m

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_IDE=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_OFFBOARD=y

CONFIG_BLK_DEV_GENERIC=y

CONFIG_BLK_DEV_AEC62XX=y

CONFIG_ATA=y

CONFIG_ATA_GENERIC=y

CONFIG_PATA_ATP867X=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=y

CONFIG_SCSI_MULTI_LUN=y

CONFIG_MD=y

CONFIG_BLK_DEV_MD=m

arch/sh/configs/microdev_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ CONFIG_IP_PNP=y 
# CONFIG_IPV6 is not set

# CONFIG_FW_LOADER is not set

CONFIG_BLK_DEV_RAM=y

CONFIG_IDE=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_SMC91X=y

arch/sh/configs/sdk7780_defconfig

+2 −4
Original line number Diff line number Diff line
@@ -44,16 +44,14 @@ CONFIG_NET_SCHED=y 
CONFIG_PARPORT=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_IDE=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_PLATFORM=y

CONFIG_BLK_DEV_GENERIC=y

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=y

CONFIG_CHR_DEV_SG=y

CONFIG_SCSI_SPI_ATTRS=y

CONFIG_SCSI_FC_ATTRS=y

CONFIG_ATA=y

CONFIG_ATA_GENERIC=y

CONFIG_PATA_PLATFORM=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_NETDEVICES=y