Messages in this thread |  | | Date | Fri, 1 Nov 2013 16:20:02 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the dt-rh tree with the powerpc tree |
| |
Hi Rob,
Today's linux-next merge of the dt-rh tree got a conflict in arch/powerpc/include/asm/prom.h between commit a3e31b458844 ("of: Move definition of of_find_next_cache_node into common code") from the powerpc tree and commit 0c3f061c195c ("of: implement of_node_to_nid as a weak function") from the dt-rh 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 arch/powerpc/include/asm/prom.h index bf09e5a065b8,7687f82a3217..000000000000 --- a/arch/powerpc/include/asm/prom.h +++ b/arch/powerpc/include/asm/prom.h @@@ -44,13 -39,9 +39,6 @@@ void of_parse_dma_window(struct device_ extern void kdump_move_device_tree(void); - #ifdef CONFIG_NUMA - extern int of_node_to_nid(struct device_node *device); - #else - static inline int of_node_to_nid(struct device_node *device) { return 0; } - #endif - #define of_node_to_nid of_node_to_nid -/* cache lookup */ -struct device_node *of_find_next_cache_node(struct device_node *np); -- extern void of_instantiate_rtc(void); extern int of_get_ibm_chip_id(struct device_node *np); [unhandled content-type:application/pgp-signature] |  |