linux-next: manual merge of the devicetree tree with the microblazetree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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
   */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/