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

Commit 02ebbbd4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  scsi: drop unused Kconfig symbol
  pci: drop unused Kconfig symbol
  stmmac: drop unused Kconfig symbol
  x86: drop unused Kconfig symbol
  powerpc: drop unused Kconfig symbols
  powerpc: 40x: drop unused Kconfig symbol
  mips: drop unused Kconfig symbols
  openrisc: drop unused Kconfig symbols
  arm: at91: drop unused Kconfig symbol
  samples: drop unused Kconfig symbol
  m32r: drop unused Kconfig symbol
  score: drop unused Kconfig symbols
  sh: drop unused Kconfig symbol
  um: drop unused Kconfig symbol
  sparc: drop unused Kconfig symbol
  alpha: drop unused Kconfig symbol

Fix up trivial conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig
as per Michal: the STMMAC_DUAL_MAC config variable is still unused and
should be deleted.
parents addd8c92 536ec4f8

arch/alpha/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -445,11 +445,6 @@ config ALPHA_EV67 
	  Is this a machine based on the EV67 core?  If in doubt, select N here

	  and the machine will be treated as an EV6.



config ALPHA_EV7

	bool

	depends on ALPHA_MARVEL

	default y



config ALPHA_MCPCIA

	bool

	depends on ALPHA_RAWHIDE

arch/arm/mach-at91/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -195,12 +195,6 @@ if ARCH_AT91SAM9260 


comment "AT91SAM9260 Variants"



config ARCH_AT91SAM9260_SAM9XE

	bool "AT91SAM9XE"

	help

	  Select this if you are using Atmel's AT91SAM9XE System-on-Chip.

	  They are basically AT91SAM9260s with various sizes of embedded Flash.



comment "AT91SAM9260 / AT91SAM9XE Board Type"



config MACH_AT91SAM9260EK

arch/m32r/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -323,13 +323,6 @@ config NODES_SHIFT 
	default "1"

	depends on NEED_MULTIPLE_NODES



# turning this on wastes a bunch of space.

# Summit needs it only when NUMA is on

config BOOT_IOREMAP

	bool

	depends on NUMA

	default n



endmenu

arch/mips/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -820,10 +820,6 @@ config ARCH_HAS_ILOG2_U64 
	bool

	default n



config ARCH_SUPPORTS_OPROFILE

	bool

	default y if !MIPS_MT_SMTC



config GENERIC_HWEIGHT

	bool

	default y
@@ -2255,16 +2251,6 @@ config HZ 


source "kernel/Kconfig.preempt"



config MIPS_INSANE_LARGE

	bool "Support for large 64-bit configurations"

	depends on CPU_R10000 && 64BIT

	help

	  MIPS R10000 does support a 44 bit / 16TB address space as opposed to

	  previous 64-bit processors which only supported 40 bit / 1TB. If you

	  need processes of more than 1TB virtual address space, say Y here.

	  This will result in additional memory usage, so it is not

	  recommended for normal users.



config KEXEC

	bool "Kexec system call (EXPERIMENTAL)"

	depends on EXPERIMENTAL

arch/mips/powertv/Kconfig

+0 −2
Original line number Diff line number Diff line 
source "arch/mips/powertv/asic/Kconfig"



config BOOTLOADER_DRIVER

	bool "PowerTV Bootloader Driver Support"

	default n