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

13 files changed, 12 insertions, 7 deletions

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 8d2a4833acda..135c674eaf9e 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -1,6 +1,7 @@
 config ALPHA
         bool
         default y
+        select ARCH_MIGHT_HAVE_PC_PARPORT
         select HAVE_AOUT
         select HAVE_IDE
         select HAVE_OPROFILE
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e089e622be79..214b698cefea 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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
diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig
index 957dd00ea561..77ea09b8bce1 100644
--- a/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@ -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
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index dfe85e92ca2e..4e4119b0e691 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -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)
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 311a300d48cc..75f25a8e3001 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -1,6 +1,7 @@
 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
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 655e1cadf692..e23cccde9c27 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -1,5 +1,6 @@
 config MICROBLAZE
         def_bool y
+        select ARCH_MIGHT_HAVE_PC_PARPORT
         select HAVE_MEMBLOCK
         select HAVE_MEMBLOCK_NODE_MAP
         select HAVE_FUNCTION_TRACER
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 867d7db11581..650de3976e7a 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1,6 +1,7 @@
 config MIPS
         bool
         default y
+        select ARCH_MIGHT_HAVE_PC_PARPORT
         select HAVE_CONTEXT_TRACKING
         select HAVE_GENERIC_DMA_COHERENT
         select HAVE_IDE
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index c03567a9a915..b5f1858baf33 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -1,6 +1,7 @@
 config PARISC
         def_bool y
         select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
+        select ARCH_MIGHT_HAVE_PC_PARPORT
         select HAVE_IDE
         select HAVE_OPROFILE
         select HAVE_FUNCTION_TRACER if 64BIT
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 4740b0a15fa8..b44b52c0a8f0 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -85,6 +85,7 @@ config GENERIC_HWEIGHT
 config PPC
         bool
         default y
+        select ARCH_MIGHT_HAVE_PC_PARPORT
         select BINFMT_ELF
         select OF
         select OF_EARLY_FLATTREE
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index e78561bc30ef..9b0979f4df7a 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -1,5 +1,6 @@
 config SUPERH
         def_bool y
+        select ARCH_MIGHT_HAVE_PC_PARPORT
         select EXPERT
         select CLKDEV_LOOKUP
         select HAVE_IDE if HAS_IOPORT
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 05fcfc634fcb..d4f7a6a163dc 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -12,6 +12,7 @@ config 64BIT
 config SPARC
         bool
         default y
+        select ARCH_MIGHT_HAVE_PC_PARPORT if SPARC64 && PCI
         select OF
         select OF_PROMTREE
         select HAVE_IDE
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 82cdd8906f3d..a7ba27b2752b 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -1,5 +1,6 @@
 config UNICORE32
         def_bool y
+        select ARCH_MIGHT_HAVE_PC_PARPORT
         select HAVE_MEMBLOCK
         select HAVE_GENERIC_DMA_COHERENT
         select HAVE_DMA_ATTRS
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 83f521aa103f..e903c71f7e69 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -22,6 +22,7 @@ config X86_64
 config X86
         def_bool y
         select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
+        select ARCH_MIGHT_HAVE_PC_PARPORT
         select HAVE_AOUT if X86_32
         select HAVE_UNSTABLE_SCHED_CLOCK
         select ARCH_SUPPORTS_NUMA_BALANCING