Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...

[linux-2.6-omap-h63xx.git] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 7927fd0faca34a5b8c1a9c45c0df3cc3c17d2bf2..f01ac9a07bf5533a7b8917775aff88f0eb5ff901 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -830,6 +830,16 @@ config DTLK
          To compile this driver as a module, choose M here: the
          module will be called dtlk.
 
+config XILINX_HWICAP
+       tristate "Xilinx HWICAP Support"
+       depends on XILINX_VIRTEX
+       help
+         This option enables support for Xilinx Internal Configuration
+         Access Port (ICAP) driver.  The ICAP is used on Xilinx Virtex
+         FPGA platforms to partially reconfigure the FPGA at runtime.
+
+         If unsure, say N.
+
 config R3964
        tristate "Siemens R3964 line discipline"
        ---help---