From: Lukasz Dalek <luk0104@gmail.com>
Date: Thu, 29 Nov 2012 12:59:23 +0000 (+0100)
Subject: pxa25x_udc: Remove usbdescriptors.h
X-Git-Tag: v2013.01-rc3~14^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27460be60d5fca8c6a4029387ee5209825c6544f;p=pandora-u-boot.git

pxa25x_udc: Remove usbdescriptors.h

usbdescriptors.h conflicts with linux/usb/ch9.h.
Remove it.

Signed-off-by: Lukasz Dalek <luk0104@gmail.com>
---

diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index dd741439aea..9ce98f07684 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -40,7 +40,6 @@
 #include <asm/io.h>
 #include <asm/arch/pxa.h>
 
-#include <usbdescriptors.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <usb/lin_gadget_compat.h>