Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a687a533 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

treewide: simplify Kconfig dependencies for removed archs 



A lot of Kconfig symbols have architecture specific dependencies.
In those cases that depend on architectures we have already removed,
they can be omitted.

Acked-by: default avatarKalle Valo <kvalo@codeaurora.org>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 79375ea3

block/bounce.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
static struct bio_set *bounce_bio_set, *bounce_bio_split;

static mempool_t *page_pool, *isa_page_pool;



#if defined(CONFIG_HIGHMEM) || defined(CONFIG_NEED_BOUNCE_POOL)

#if defined(CONFIG_HIGHMEM)

static __init int init_emergency_pool(void)

{

#if defined(CONFIG_HIGHMEM) && !defined(CONFIG_MEMORY_HOTPLUG)

drivers/ide/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ comment "IDE chipset support/bugfixes" 


config IDE_GENERIC

	tristate "generic/default IDE chipset support"

	depends on ALPHA || X86 || IA64 || M32R || MIPS || ARCH_RPC

	depends on ALPHA || X86 || IA64 || MIPS || ARCH_RPC

	default ARM && ARCH_RPC

	help

	  This is the generic IDE driver.  This driver attaches to the

drivers/ide/ide-generic.c

+1 −11
Original line number Diff line number Diff line
@@ -13,13 +13,10 @@ 
#include <linux/ide.h>

#include <linux/pci_ids.h>



/* FIXME: convert arm and m32r to use ide_platform host driver */

/* FIXME: convert arm to use ide_platform host driver */

#ifdef CONFIG_ARM

#include <asm/irq.h>

#endif

#ifdef CONFIG_M32R

#include <asm/m32r.h>

#endif



#define DRV_NAME	"ide_generic"
@@ -35,13 +32,6 @@ static const struct ide_port_info ide_generic_port_info = { 
#ifdef CONFIG_ARM

static const u16 legacy_bases[] = { 0x1f0 };

static const int legacy_irqs[]  = { IRQ_HARDDISK };

#elif defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) || \

      defined(CONFIG_PLAT_OPSPUT)

static const u16 legacy_bases[] = { 0x1f0 };

static const int legacy_irqs[]  = { PLD_IRQ_CFIREQ };

#elif defined(CONFIG_PLAT_MAPPI3)

static const u16 legacy_bases[] = { 0x1f0, 0x170 };

static const int legacy_irqs[]  = { PLD_IRQ_CFIREQ, PLD_IRQ_IDEIREQ };

#elif defined(CONFIG_ALPHA)

static const u16 legacy_bases[] = { 0x1f0, 0x170, 0x1e8, 0x168 };

static const int legacy_irqs[]  = { 14, 15, 11, 10 };

drivers/input/joystick/analog.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static unsigned int get_time_pit(void) 
#define GET_TIME(x)	do { x = (unsigned int)rdtsc(); } while (0)

#define DELTA(x,y)	((y)-(x))

#define TIME_NAME	"TSC"

#elif defined(__alpha__) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_RISCV) || defined(CONFIG_TILE)

#elif defined(__alpha__) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_RISCV)

#define GET_TIME(x)	do { x = get_cycles(); } while (0)

#define DELTA(x,y)	((y)-(x))

#define TIME_NAME	"get_cycles"

drivers/isdn/hisax/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ config HISAX_16_3 


config HISAX_TELESPCI

	bool "Teles PCI"

	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN)))

	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || (XTENSA && !CPU_LITTLE_ENDIAN)))

	help

	  This enables HiSax support for the Teles PCI.

	  See <file:Documentation/isdn/README.HiSax> on how to configure it.
@@ -237,7 +237,7 @@ config HISAX_MIC 


config HISAX_NETJET

	bool "NETjet card"

	depends on PCI && (BROKEN || !(PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN) || MICROBLAZE))

	depends on PCI && (BROKEN || !(PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || (XTENSA && !CPU_LITTLE_ENDIAN) || MICROBLAZE))

	depends on VIRT_TO_BUS

	help

	  This enables HiSax support for the NetJet from Traverse
@@ -249,7 +249,7 @@ config HISAX_NETJET 


config HISAX_NETJET_U

	bool "NETspider U card"

	depends on PCI && (BROKEN || !(PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN) || MICROBLAZE))

	depends on PCI && (BROKEN || !(PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || (XTENSA && !CPU_LITTLE_ENDIAN) || MICROBLAZE))

	depends on VIRT_TO_BUS

	help

	  This enables HiSax support for the Netspider U interface ISDN card
@@ -318,7 +318,7 @@ config HISAX_GAZEL 


config HISAX_HFC_PCI

	bool "HFC PCI-Bus cards"

	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN)))

	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || (XTENSA && !CPU_LITTLE_ENDIAN)))

	help

	  This enables HiSax support for the HFC-S PCI 2BDS0 based cards.
@@ -343,7 +343,7 @@ config HISAX_HFC_SX 


config HISAX_ENTERNOW_PCI

	bool "Formula-n enter:now PCI card"

	depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN)))

	depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || (XTENSA && !CPU_LITTLE_ENDIAN)))

	help

	  This enables HiSax support for the Formula-n enter:now PCI

	  ISDN card.