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

Commit f13399f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming 

Pull Kconfig cleanups from Mark Salter:
 "Remove some unused config options from C6X and clean up PC_PARPORT
  dependencies.  The latter was discussed here:

    https://lkml.org/lkml/2013/10/8/12"

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  c6x: remove unused COMMON_CLKDEV Kconfig parameter
  Kconfig cleanup (PARPORT_PC dependencies)
  x86: select ARCH_MIGHT_HAVE_PC_PARPORT
  unicore32: select ARCH_MIGHT_HAVE_PC_PARPORT
  sparc: select ARCH_MIGHT_HAVE_PC_PARPORT
  sh: select ARCH_MIGHT_HAVE_PC_PARPORT
  powerpc: select ARCH_MIGHT_HAVE_PC_PARPORT
  parisc: select ARCH_MIGHT_HAVE_PC_PARPORT
  mips: select ARCH_MIGHT_HAVE_PC_PARPORT
  microblaze: select ARCH_MIGHT_HAVE_PC_PARPORT
  m68k: select ARCH_MIGHT_HAVE_PC_PARPORT
  ia64: select ARCH_MIGHT_HAVE_PC_PARPORT
  arm: select ARCH_MIGHT_HAVE_PC_PARPORT
  alpha: select ARCH_MIGHT_HAVE_PC_PARPORT
  c6x: remove unused parameter in Kconfig
parents 049ffa8a b2c32b32

arch/alpha/Kconfig

+1 −0
Original line number Diff line number Diff line 
config ALPHA

	bool

	default y

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select HAVE_AOUT

	select HAVE_IDE

	select HAVE_OPROFILE

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ config ARM 
	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAVE_CUSTOM_GPIO_H

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_WANT_IPC_PARSE_VERSION

	select BUILDTIME_EXTABLE_SORT if MMU

arch/c6x/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ config GENERIC_HWEIGHT 
config GENERIC_BUG

	def_bool y



config COMMON_CLKDEV

	def_bool y



config C6X_BIG_KERNEL

	bool "Build a big kernel"

	help
@@ -105,10 +102,6 @@ menu "Processor type and features" 


source "arch/c6x/platforms/Kconfig"



config TMS320C6X_CACHES_ON

	bool "L2 cache support"

	default y



config KERNEL_RAM_BASE_ADDRESS

	hex "Virtual address of memory base"

	default 0xe0000000 if SOC_TMS320C6455

arch/ia64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ menu "Processor type and features" 


config IA64

	bool

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select PCI if (!IA64_HP_SIM)

	select ACPI if (!IA64_HP_SIM)

	select PM if (!IA64_HP_SIM)

arch/m68k/Kconfig

+1 −0
Original line number Diff line number Diff line 
config M68K

	bool

	default y

	select ARCH_MIGHT_HAVE_PC_PARPORT if ISA

	select HAVE_IDE

	select HAVE_AOUT if MMU

	select HAVE_DEBUG_BUGVERBOSE