projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Drop linux/delay.h from common header
[oweals/u-boot.git]
/
drivers
/
usb
/
gadget
/
pxa25x_udc.c
diff --git
a/drivers/usb/gadget/pxa25x_udc.c
b/drivers/usb/gadget/pxa25x_udc.c
index d4460b2dc715fe2ca197533aed285ee63fe35f0f..d19ac1d035318d2d31c6a0bd4c634b098350e70c 100644
(file)
--- a/
drivers/usb/gadget/pxa25x_udc.c
+++ b/
drivers/usb/gadget/pxa25x_udc.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Intel PXA25x and IXP4xx on-chip full speed USB device controllers
*
/*
* Intel PXA25x and IXP4xx on-chip full speed USB device controllers
*
@@
-8,8
+9,6
@@
* Copyright (C) 2003 Joshua Wise
* Copyright (C) 2012 Lukasz Dalek <luk0104@gmail.com>
*
* Copyright (C) 2003 Joshua Wise
* Copyright (C) 2012 Lukasz Dalek <luk0104@gmail.com>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* MODULE_AUTHOR("Frank Becker, Robert Schwebel, David Brownell");
*/
* MODULE_AUTHOR("Frank Becker, Robert Schwebel, David Brownell");
*/
@@
-19,18
+18,21
@@
#include <common.h>
#include <errno.h>
#include <common.h>
#include <errno.h>
+#include <log.h>
#include <asm/byteorder.h>
#include <asm/system.h>
#include <asm/mach-types.h>
#include <asm/unaligned.h>
#include <asm/byteorder.h>
#include <asm/system.h>
#include <asm/mach-types.h>
#include <asm/unaligned.h>
+#include <dm/devres.h>
+#include <linux/bug.h>
#include <linux/compat.h>
#include <malloc.h>
#include <asm/io.h>
#include <asm/arch/pxa.h>
#include <linux/compat.h>
#include <malloc.h>
#include <asm/io.h>
#include <asm/arch/pxa.h>
+#include <linux/delay.h>
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
-#include <usb/lin_gadget_compat.h>
#include <asm/arch/pxa-regs.h>
#include "pxa25x_udc.h"
#include <asm/arch/pxa-regs.h>
#include "pxa25x_udc.h"
@@
-2041,7
+2043,7
@@
extern void udc_disconnect(void)
/*-------------------------------------------------------------------------*/
extern int
/*-------------------------------------------------------------------------*/
extern int
-usb_gadget_handle_interrupts(
void
)
+usb_gadget_handle_interrupts(
int index
)
{
return pxa25x_udc_irq();
}
{
return pxa25x_udc_irq();
}