diff --git a/[refs] b/[refs]
index 141d80cbdf8c..c811ed75b42f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e403b242e77289bb13f6219adaad5b25e086949
+refs/heads/master: 1a91b01659ced733492f275e8d634153cebe9443
diff --git a/trunk/arch/tile/Kconfig b/trunk/arch/tile/Kconfig
index 932e4430f7f3..c9a3c1fe7297 100644
--- a/trunk/arch/tile/Kconfig
+++ b/trunk/arch/tile/Kconfig
@@ -412,14 +412,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