From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Rob Herring <rob.herring@calxeda•com>,
Grant Likely <grant.likely@secretlab•ca>,
Alexander Shishkin <alexander.shishkin@linux•intel.com>
Subject: linux-next: manual merge of the usb tree with the devicetree tree
Date: Tue, 25 Jun 2013 16:53:10 +1000 [thread overview]
Message-ID: <20130625165310.161dafbc62ab505ecbfc3cd3@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1062 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/chipidea/Makefile between commit 8973ba8b325f ("usb:
chipidea: depend on CONFIG_OF instead of CONFIG_OF_DEVICE") from the
devicetree tree and commit 8e22978c5708 ("usb: chipidea: drop "13xxx"
infix") from the usb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/usb/chipidea/Makefile
index 4113feb,3bbbcba..0000000
--- a/drivers/usb/chipidea/Makefile
+++ b/drivers/usb/chipidea/Makefile
@@@ -13,9 -13,9 +13,9 @@@ obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_m
# PCI doesn't provide stubs, need to check
ifneq ($(CONFIG_PCI),)
- obj-$(CONFIG_USB_CHIPIDEA) += ci13xxx_pci.o
+ obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o
endif
-ifneq ($(CONFIG_OF_DEVICE),)
+ifneq ($(CONFIG_OF),)
- obj-$(CONFIG_USB_CHIPIDEA) += ci13xxx_imx.o usbmisc_imx.o
+ obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_imx.o usbmisc_imx.o
endif
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-06-25 6:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-25 6:53 Stephen Rothwell [this message]
2013-06-25 15:18 ` linux-next: manual merge of the usb tree with the devicetree tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2020-05-28 6:22 Stephen Rothwell
2020-05-28 10:49 ` Greg KH
2020-05-28 14:14 ` Rob Herring
2020-05-29 8:26 ` Greg KH
2020-05-29 8:28 ` Greg KH
2020-05-29 8:44 ` Felipe Balbi
2020-05-29 14:04 ` Rob Herring
2020-05-29 14:24 ` Felipe Balbi
2023-10-18 2:13 Stephen Rothwell
2023-10-18 7:56 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130625165310.161dafbc62ab505ecbfc3cd3@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alexander.shishkin@linux$(echo .)intel.com \
--cc=grant.likely@secretlab$(echo .)ca \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rob.herring@calxeda$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox