Merge tag 'char-misc-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[karo-tx-linux.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 8baff0effc7dfa93cde0df9dad76556a6609adab..a43d0c467274399b641cd469e38f4f2dcc269dbe 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -54,6 +54,7 @@ config AD525X_DPOT_SPI
 config ATMEL_PWM
        tristate "Atmel AT32/AT91 PWM support"
        depends on HAVE_CLK
+       depends on AVR32 || AT91SAM9263 || AT91SAM9RL || AT91SAM9G45
        help
          This option enables device driver support for the PWM channels
          on certain Atmel processors.  Pulse Width Modulation is used for
@@ -200,7 +201,7 @@ config ICS932S401
 
 config ATMEL_SSC
        tristate "Device driver for Atmel SSC peripheral"
-       depends on HAS_IOMEM
+       depends on HAS_IOMEM && (AVR32 || ARCH_AT91 || COMPILE_TEST)
        ---help---
          This option enables device driver support for Atmel Synchronized
          Serial Communication peripheral (SSC).
@@ -468,7 +469,7 @@ config BMP085_SPI
 config PCH_PHUB
        tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) PHUB"
        select GENERIC_NET_UTILS
-       depends on PCI
+       depends on PCI && (X86_32 || COMPILE_TEST)
        help
          This driver is for PCH(Platform controller Hub) PHUB(Packet Hub) of
          Intel Topcliff which is an IOH(Input/Output Hub) for x86 embedded
@@ -515,6 +516,15 @@ config SRAM
          the genalloc API. It is supposed to be used for small on-chip SRAM
          areas found on many SoCs.
 
+config VEXPRESS_SYSCFG
+       bool "Versatile Express System Configuration driver"
+       depends on VEXPRESS_CONFIG
+       default y
+       help
+         ARM Ltd. Versatile Express uses specialised platform configuration
+         bus. System Configuration interface is one of the possible means
+         of generating transactions on this bus.
+
 source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
 source "drivers/misc/cb710/Kconfig"