Hi Felipe, After merging the usb-gadget tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/usb/phy/phy-keystone.c: In function 'keystone_usbphy_probe': drivers/usb/phy/phy-keystone.c:96:4: warning: passing argument 3 of 'usb_phy_gen_create_phy' makes pointer from integer without a cast [enabled by default] USB_PHY_TYPE_USB2, 0, false); ^ In file included from drivers/usb/phy/phy-keystone.c:25:0: drivers/usb/phy/phy-generic.h:18:5: note: expected 'struct usb_phy_gen_xceiv_platform_data *' but argument is of type 'int' int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_gen_xceiv *nop, ^ drivers/usb/phy/phy-keystone.c:96:4: error: too many arguments to function 'usb_phy_gen_create_phy' USB_PHY_TYPE_USB2, 0, false); ^ In file included from drivers/usb/phy/phy-keystone.c:25:0: drivers/usb/phy/phy-generic.h:18:5: note: declared here int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_gen_xceiv *nop, ^ Caused by commit 25acdd08fd71 ("usb: phy: add Keystone usb phy driver") interacting with commit bd27fa44e138 ("usb: phy: add Keystone usb phy driver") which was merged before v3.13-rc1 and is included in the usb-gadget tree. I have used the usb-gadget tree from next-20131206 again for today. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpToGYsA3QDt.pgp
Description: PGP signature