Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[mv-sheeva.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 0c31927c1562f0426203afc97bca8e97bd2b71e1..1f69743b12ec036239fa6fe05540cec600c5b4b9 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -248,15 +248,15 @@ config CS5535_CLOCK_EVENT_SRC
          generic PIT, and are suitable for use as high-res timers.
 
 config HP_ILO
-       tristate "Channel interface driver for HP iLO/iLO2 processor"
+       tristate "Channel interface driver for the HP iLO processor"
        depends on PCI
        default n
        help
          The channel interface driver allows applications to communicate
-         with iLO/iLO2 management processors present on HP ProLiant
-         servers.  Upon loading, the driver creates /dev/hpilo/dXccbN files,
-         which can be used to gather data from the management processor,
-         via read and write system calls.
+         with iLO management processors present on HP ProLiant servers.
+         Upon loading, the driver creates /dev/hpilo/dXccbN files, which
+         can be used to gather data from the management processor, via
+         read and write system calls.
 
          To compile this driver as a module, choose M here: the
          module will be called hpilo.
@@ -368,7 +368,7 @@ config VMWARE_BALLOON
          If unsure, say N.
 
          To compile this driver as a module, choose M here: the
-         module will be called vmware_balloon.
+         module will be called vmw_balloon.
 
 config ARM_CHARLCD
        bool "ARM Ltd. Character LCD Driver"
@@ -390,6 +390,18 @@ config BMP085
          To compile this driver as a module, choose M here: the
          module will be called bmp085.
 
+config PCH_PHUB
+       tristate "PCH Packet Hub of Intel Topcliff"
+       depends on PCI
+       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
+         processor. The Topcliff has MAC address and Option ROM data in SROM.
+         This driver can access MAC address and Option ROM data in SROM.
+
+         To compile this driver as a module, choose M here: the module will
+         be called pch_phub.
+
 source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
 source "drivers/misc/cb710/Kconfig"