linux-kernel - linux-next: manual merge of the usb tree with the devicetree tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130625165310.161dafbc62ab505ecbfc3cd3@canb.auug.org.au>
Date:	Tue, 25 Jun 2013 16:53:10 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rob Herring <rob.herring@...xeda.com>,
	Grant Likely <grant.likely@...retlab.ca>,
	Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Subject: linux-next: manual merge of the usb tree with the devicetree tree

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@...b.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

Content of type "application/pgp-signature" skipped