Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
commit
9fe1155233
265 changed files with 2795 additions and 1910 deletions
|
|
@ -48,6 +48,8 @@ struct omap_usb_config {
|
|||
u32 (*usb2_init)(unsigned nwires, unsigned alt_pingroup);
|
||||
|
||||
int (*ocpi_enable)(void);
|
||||
|
||||
void (*lb_reset)(void);
|
||||
};
|
||||
|
||||
#endif /* __LINUX_USB_OMAP1_H */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue