Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

No conflicts.

Jakub Kicinski committed 5 years ago

Commit 9fe11552 parents c514fbb 1da3854265 files · +2787 −1902Browse files

Showing the changes to include/linux/platform_data (1 of 265 files). Show all

Unified · Split

@@ -48,6 +48,8 @@ struct omap_usb_config { · 47 unmodified lines
48	u32 (*usb2_init)(unsigned nwires, unsigned alt_pingroup);	48	u32 (*usb2_init)(unsigned nwires, unsigned alt_pingroup);
49		49
50	int (*ocpi_enable)(void);	50	int (*ocpi_enable)(void);
		51
		52	void (*lb_reset)(void);
51	};	53	};
52		54
53	#endif /* __LINUX_USB_OMAP1_H */	55	#endif /* __LINUX_USB_OMAP1_H */