usb: musb-new: CONFIG_MUSB prefix replacement with CONFIG_USB_MUSB

[J-u-boot.git] / drivers / usb / musb-new / musb_gadget.c

diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c
index d2cb91a898fa07794c1ab144ba5ef1ddd676184e..309dc7f93f63530f011d310cedef5d159679559a 100644 (file)
--- a/drivers/usb/musb-new/musb_gadget.c
+++ b/drivers/usb/musb-new/musb_gadget.c
@@ -33,7 +33,6 @@
  *
  */
 
-#define __UBOOT__
 #ifndef __UBOOT__
 #include <linux/kernel.h>
 #include <linux/list.h>
@@ -100,7 +99,7 @@
 #define is_buffer_mapped(req) (is_dma_capable() && \
                                        (req->map_state != UN_MAPPED))
 
-#ifndef CONFIG_MUSB_PIO_ONLY
+#ifndef CONFIG_USB_MUSB_PIO_ONLY
 /* Maps the buffer to dma  */
 
 static inline void map_dma_buffer(struct musb_request *request,
@@ -383,7 +382,7 @@ static void txstate(struct musb *musb, struct musb_request *req)
                        epnum, musb_ep->packet_sz, fifo_count,
                        csr);
 
-#ifndef        CONFIG_MUSB_PIO_ONLY
+#ifndef        CONFIG_USB_MUSB_PIO_ONLY
        if (is_buffer_mapped(req)) {
                struct dma_controller   *c = musb->dma_controller;
                size_t request_size;