Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi

[mirror_ubuntu-artful-kernel.git] / drivers / Kconfig

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 52895081db0baaca5a372c8fe0d850d866d83089..d236aef7e59fff7b7bc255cea2a86ce0a40425c1 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -40,8 +40,6 @@ source "drivers/net/Kconfig"
 
 source "drivers/isdn/Kconfig"
 
-source "drivers/telephony/Kconfig"
-
 # input before char - char/joystick depends on it. As does USB.
 
 source "drivers/input/Kconfig"
@@ -118,6 +116,8 @@ source "drivers/vlynq/Kconfig"
 
 source "drivers/virtio/Kconfig"
 
+source "drivers/hv/Kconfig"
+
 source "drivers/xen/Kconfig"
 
 source "drivers/staging/Kconfig"
@@ -132,9 +132,11 @@ source "drivers/clocksource/Kconfig"
 
 source "drivers/iommu/Kconfig"
 
-source "drivers/virt/Kconfig"
+source "drivers/remoteproc/Kconfig"
 
-source "drivers/hv/Kconfig"
+source "drivers/rpmsg/Kconfig"
+
+source "drivers/virt/Kconfig"
 
 source "drivers/devfreq/Kconfig"