Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-2.6-microblaze.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index f532c59..f4fb5c5 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -402,6 +402,16 @@ config SRAM
 config SRAM_EXEC
        bool
 
+config DW_XDATA_PCIE
+       depends on PCI
+       tristate "Synopsys DesignWare xData PCIe driver"
+       help
+         This driver allows controlling Synopsys DesignWare PCIe traffic
+         generator IP also known as xData, present in Synopsys DesignWare
+         PCIe Endpoint prototype.
+
+         If unsure, say N.
+
 config PCI_ENDPOINT_TEST
        depends on PCI
        select CRC32
@@ -427,14 +437,6 @@ config MISC_RTSX
        tristate
        default MISC_RTSX_PCI || MISC_RTSX_USB
 
-config PVPANIC
-       tristate "pvpanic device support"
-       depends on HAS_IOMEM && (ACPI || OF)
-       help
-         This driver provides support for the pvpanic device.  pvpanic is
-         a paravirtualized device provided by QEMU; it lets a virtual machine
-         (guest) communicate panic events to the host.
-
 config HISI_HIKEY_USB
        tristate "USB GPIO Hub on HiSilicon Hikey 960/970 Platform"
        depends on (OF && GPIOLIB) || COMPILE_TEST
@@ -461,4 +463,5 @@ source "drivers/misc/bcm-vk/Kconfig"
 source "drivers/misc/cardreader/Kconfig"
 source "drivers/misc/habanalabs/Kconfig"
 source "drivers/misc/uacce/Kconfig"
+source "drivers/misc/pvpanic/Kconfig"
 endmenu