Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...

[karo-tx-linux.git] / arch / tile / Kconfig

diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 1603f304339986be9f96bdd8406ebf6973e8130b..875d008828b8ec619c295cf1b2d5c8923ea0389b 100644 (file)
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -7,12 +7,15 @@ config TILE
        select HAVE_DMA_API_DEBUG
        select HAVE_KVM if !TILEGX
        select GENERIC_FIND_FIRST_BIT
+       select SYSCTL_EXCEPTION_TRACE
        select USE_GENERIC_SMP_HELPERS
        select CC_OPTIMIZE_FOR_SIZE
+       select HAVE_DEBUG_KMEMLEAK
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_IRQ_PROBE
        select GENERIC_PENDING_IRQ if SMP
        select GENERIC_IRQ_SHOW
+       select HAVE_DEBUG_BUGVERBOSE
        select HAVE_SYSCALL_WRAPPERS if TILEGX
        select SYS_HYPERVISOR
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
@@ -413,14 +416,6 @@ config TILE_USB
 config NEED_BOUNCE_POOL
        def_bool USB_OHCI_HCD
 
-config HOTPLUG
-       bool "Support for hot-pluggable devices"
-       ---help---
-         Say Y here if you want to plug devices into your computer while
-         the system is running, and be able to use them quickly.  In many
-         cases, the devices can likewise be unplugged at any time too.
-         One well-known example of this is USB.
-
 source "drivers/pci/hotplug/Kconfig"
 
 endmenu