Patchwork [U-Boot] pxa25x_udc: Remove usbdescriptors.h

login
register
mail settings
Submitter Łukasz Dałek
Date Nov. 29, 2012, 12:59 p.m.
Message ID <1354193963-14384-1-git-send-email-luk0104@gmail.com>
Download mbox | patch
Permalink /patch/202735/
State Accepted
Delegated to: Marek Vasut
Headers show

Comments

Łukasz Dałek - Nov. 29, 2012, 12:59 p.m.
usbdescriptors.h conflicts with linux/usb/ch9.h.
Remove it.

Signed-off-by: Lukasz Dalek <luk0104@gmail.com>
---
 drivers/usb/gadget/pxa25x_udc.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
Marek Vasut - Nov. 29, 2012, 2:27 p.m.
Dear Lukasz Dalek,

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

Applied, thanks

> Signed-off-by: Lukasz Dalek <luk0104@gmail.com>
> ---
>  drivers/usb/gadget/pxa25x_udc.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/usb/gadget/pxa25x_udc.c
> b/drivers/usb/gadget/pxa25x_udc.c index dd74143..9ce98f0 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>

Best regards,
Marek Vasut
Łukasz Dałek - Nov. 29, 2012, 2:45 p.m.
On 29.11.2012 15:27, Marek Vasut wrote:
> Dear Lukasz Dalek,
>
>> usbdescriptors.h conflicts with linux/usb/ch9.h.
>> Remove it.
> Applied, thanks
>
>> Signed-off-by: Lukasz Dalek<luk0104@gmail.com>
>> ---
>>   drivers/usb/gadget/pxa25x_udc.c |    1 -
>>   1 files changed, 0 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/usb/gadget/pxa25x_udc.c
>> b/drivers/usb/gadget/pxa25x_udc.c index dd74143..9ce98f0 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>
> Best regards,
> Marek Vasut
One more question. I've send you before patch which enables
support for USB in h2200 device, which you accepted but
didn't push. Did you find more problem out there or just forgot to
apply?

Łukasz Dałek
Marek Vasut - Nov. 29, 2012, 2:51 p.m.
Dear Łukasz Dałek,

> On 29.11.2012 15:27, Marek Vasut wrote:
> > Dear Lukasz Dalek,
> > 
> >> usbdescriptors.h conflicts with linux/usb/ch9.h.
> >> Remove it.
> > 
> > Applied, thanks
> > 
> >> Signed-off-by: Lukasz Dalek<luk0104@gmail.com>
> >> ---
> >> 
> >>   drivers/usb/gadget/pxa25x_udc.c |    1 -
> >>   1 files changed, 0 insertions(+), 1 deletions(-)
> >> 
> >> diff --git a/drivers/usb/gadget/pxa25x_udc.c
> >> b/drivers/usb/gadget/pxa25x_udc.c index dd74143..9ce98f0 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>
> > 
> > Best regards,
> > Marek Vasut
> 
> One more question. I've send you before patch which enables
> support for USB in h2200 device, which you accepted but
> didn't push. Did you find more problem out there or just forgot to
> apply?

It might have gone lost ... can you repost?

Best regards,
Marek Vasut

Patch

diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index dd74143..9ce98f0 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>