Merge tag 'mfd-3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd...

[~andy/linux] / drivers / usb / phy / phy-isp1301-omap.c

diff --git a/drivers/usb/phy/phy-isp1301-omap.c b/drivers/usb/phy/phy-isp1301-omap.c
index ae481afcb3ece1358ffd8244ad6df9cbccb93081..d3a5160e4cc794f6e1ead500822d20157b06abd1 100644 (file)
--- a/drivers/usb/phy/phy-isp1301-omap.c
+++ b/drivers/usb/phy/phy-isp1301-omap.c
@@ -40,9 +40,7 @@
 
 #include <mach/usb.h>
 
-#ifndef        DEBUG
-#undef VERBOSE
-#endif
+#undef VERBOSE
 
 
 #define        DRIVER_VERSION  "24 August 2004"
@@ -387,7 +385,6 @@ static void b_idle(struct isp1301 *isp, const char *tag)
 static void
 dump_regs(struct isp1301 *isp, const char *label)
 {
-#ifdef DEBUG
        u8      ctrl = isp1301_get_u8(isp, ISP1301_OTG_CONTROL_1);
        u8      status = isp1301_get_u8(isp, ISP1301_OTG_STATUS);
        u8      src = isp1301_get_u8(isp, ISP1301_INTERRUPT_SOURCE);
@@ -396,7 +393,6 @@ dump_regs(struct isp1301 *isp, const char *label)
                omap_readl(OTG_CTRL), label, state_name(isp),
                ctrl, status, src);
        /* mode control and irq enables don't change much */
-#endif
 }
 
 /*-------------------------------------------------------------------------*/