Merge remote-tracking branch 'char-misc/char-misc-next'

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

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index f0ba78289504c367ea07d8d3f57e12310016652d..a216b46677429402168c587c638cc1d710632960 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -440,7 +440,7 @@ config ARM_CHARLCD
          still useful.
 
 config BMP085
-       bool
+       tristate
        depends on SYSFS
 
 config BMP085_I2C
@@ -470,7 +470,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 && (X86_32 || COMPILE_TEST)
+       depends on PCI && (X86_32 || MIPS || 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