From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Grant Likely <grant.likely@secretlab.ca>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Michal Simek <michal.simek@petalogix.com>
Subject: linux-next: manual merge of the devicetree tree with the microblaze tree
Date: Mon, 15 Feb 2010 18:13:35 +1100 [thread overview]
Message-ID: <20100215181335.f53ad8a0.sfr@canb.auug.org.au> (raw)
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
arch/microblaze/include/asm/prom.h between commit
8d0fd5d72f5bcc597427afd73c6d5ba97fe4780f ("microblaze: Enable PCI,
missing files") from the microblaze tree and commit
df0edeb59eb559be0bee53452fda2f5cc0ae133f ("of: remove undefined
request_OF_resource & release_OF_resource") from the devicetree tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/microblaze/include/asm/prom.h
index 7675ce2,03f45a9..0000000
--- a/arch/microblaze/include/asm/prom.h
+++ b/arch/microblaze/include/asm/prom.h
@@@ -40,32 -31,6 +31,21 @@@
/* Other Prototypes */
extern int early_uartlite_console(void);
+#ifdef CONFIG_PCI
+/*
+ * PCI <-> OF matching functions
+ * (XXX should these be here?)
+ */
+struct pci_bus;
+struct pci_dev;
+extern int pci_device_from_OF_node(struct device_node *node,
+ u8 *bus, u8 *devfn);
+extern struct device_node *pci_busdev_to_OF_node(struct pci_bus *bus,
+ int devfn);
+extern struct device_node *pci_device_to_OF_node(struct pci_dev *dev);
+extern void pci_create_OF_bus_map(void);
+#endif
+
- extern struct resource *request_OF_resource(struct device_node *node,
- int index, const char *name_postfix);
- extern int release_OF_resource(struct device_node *node, int index);
-
/*
* OF address retreival & translation
*/
next reply other threads:[~2010-02-15 7:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-15 7:13 Stephen Rothwell [this message]
2010-02-16 21:38 ` Grant Likely
2010-07-27 3:17 Stephen Rothwell
2010-07-27 3:19 ` Grant Likely
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=20100215181335.f53ad8a0.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=michal.simek@petalogix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®