On Wed, Jul 16, 2014 at 07:39:46PM +0200, Robert Jarzmik wrote: > Felipe Balbi <balbi@xxxxxx> writes: > > > Hi, > > > > On Mon, Jul 14, 2014 at 07:05:32PM +0200, Robert Jarzmik wrote: > >> Remove mach specific includes and use platform_data includes. > >> > >> Signed-off-by: Robert Jarzmik <robert.jarzmik@xxxxxxx> > >> --- > >> drivers/usb/gadget/pxa27x_udc.c | 3 +-- > >> 1 file changed, 1 insertion(+), 2 deletions(-) > >> > >> diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c > >> index fed8b2e..04aced8 100644 > >> --- a/drivers/usb/gadget/pxa27x_udc.c > >> +++ b/drivers/usb/gadget/pxa27x_udc.c > >> @@ -28,12 +28,11 @@ > >> #include <linux/of_gpio.h> > >> > >> #include <asm/byteorder.h> > >> -#include <mach/hardware.h> > >> > >> #include <linux/usb.h> > >> #include <linux/usb/ch9.h> > >> #include <linux/usb/gadget.h> > >> -#include <mach/udc.h> > >> +#include <linux/platform_data/pxa2xx_udc.h> > > > > this patch is fixing includes which were added in patch 1. > Ah yes, you're correct. The includes breakage began at patch 1, I probably have > it from a missed rebase in my tree ... > > Unfortunately for me it means a v5, with the includes fixed in patch 1 (the > asm/byteorder.h looks very ugly and unwise too), and patch 4 discarded (actually > merged into patch 1 fixes). right, it should be quick enough to do that with git rebase -i -- balbi
Attachment:
signature.asc
Description: Digital signature