From 53c27fc6aaf749f70ab46cfc1e2a9fa70e0de1e4 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Tue, 20 Dec 2011 02:42:27 +0200
Subject: [PATCH] --- yaml --- r: 280911 b: refs/heads/master c:
 c6bde9b5ae7481d6e7a8aff46c5f8223538abc66 h: refs/heads/master i:   280909:
 1fc8b7f2d0f67d5eb5ad593a9c50df3694d8d2b5   280907:
 545bc81e8b62db67fd6d4d54ccd93adc570a8c14   280903:
 da4b7d8a0852ae0a114dd8a9d093d738433d478c   280895:
 aeabf0fab9bb2efa298f0cfd8205ade8c1adce9b v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/usb/musb/Kconfig | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2f50de2f2293..0301a12bb428 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54a605f4cee1b208d8728352d6851680d39c7161
+refs/heads/master: c6bde9b5ae7481d6e7a8aff46c5f8223538abc66
diff --git a/trunk/drivers/usb/musb/Kconfig b/trunk/drivers/usb/musb/Kconfig
index f6e305fe6290..f70cab3beeec 100644
--- a/trunk/drivers/usb/musb/Kconfig
+++ b/trunk/drivers/usb/musb/Kconfig
@@ -30,9 +30,10 @@ config USB_MUSB_HDRC
 	  To compile this driver as a module, choose M here; the
 	  module will be called "musb-hdrc".
 
+if USB_MUSB_HDRC
+
 choice
 	prompt "Platform Glue Layer"
-	depends on USB_MUSB_HDRC
 
 config USB_MUSB_DAVINCI
 	tristate "DaVinci"
@@ -77,28 +78,24 @@ choice
 
 config USB_UX500_DMA
 	bool 'ST Ericsson U8500 and U5500'
-	depends on USB_MUSB_HDRC
 	depends on USB_MUSB_UX500
 	help
 	  Enable DMA transfers on UX500 platforms.
 
 config USB_INVENTRA_DMA
 	bool 'Inventra'
-	depends on USB_MUSB_HDRC
 	depends on USB_MUSB_OMAP2PLUS || USB_MUSB_BLACKFIN
 	help
 	  Enable DMA transfers using Mentor's engine.
 
 config USB_TI_CPPI_DMA
 	bool 'TI CPPI (Davinci)'
-	depends on USB_MUSB_HDRC
 	depends on USB_MUSB_DAVINCI
 	help
 	  Enable DMA transfers when TI CPPI DMA is available.
 
 config USB_TUSB_OMAP_DMA
 	bool 'TUSB 6010'
-	depends on USB_MUSB_HDRC
 	depends on USB_MUSB_TUSB6010
 	depends on ARCH_OMAP
 	help
@@ -106,7 +103,6 @@ config USB_TUSB_OMAP_DMA
 
 config MUSB_PIO_ONLY
 	bool 'Disable DMA (always use PIO)'
-	depends on USB_MUSB_HDRC
 	help
 	  All data is copied between memory and FIFO by the CPU.
 	  DMA controllers are ignored.
@@ -117,3 +113,5 @@ config MUSB_PIO_ONLY
 	  parameter.
 
 endchoice
+
+endif # USB_MUSB_HDRC