diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2009-10-15 12:58:07 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2009-10-15 12:58:07 -0400 |
commit | 82b2928c95d824afd9af3bb41660f3c3fa1f234e (patch) | |
tree | 620840d7cf73cde66496d988b35bdfd976c1d7cf /arch | |
parent | 8482f56803b9498af84bc09e7bc769a5924f6443 (diff) |
of: merge other miscellaneous prototypes
Merge common prototypes used by Microblaze and PowerPC
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Michal Simek <monstr@monstr.eu>
Acked-by: Stephen Neuendorffer <stephen.neuendorffer@xilinx.com>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/microblaze/include/asm/prom.h | 12 | ||||
-rw-r--r-- | arch/powerpc/include/asm/prom.h | 14 |
2 files changed, 0 insertions, 26 deletions
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index be4db2a22245..ef3ec1d6ceb3 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h | |||
@@ -45,19 +45,7 @@ extern void of_attach_node(struct device_node *); | |||
45 | extern void of_detach_node(struct device_node *); | 45 | extern void of_detach_node(struct device_node *); |
46 | 46 | ||
47 | /* Other Prototypes */ | 47 | /* Other Prototypes */ |
48 | extern void finish_device_tree(void); | ||
49 | extern void unflatten_device_tree(void); | ||
50 | extern int early_uartlite_console(void); | 48 | extern int early_uartlite_console(void); |
51 | extern void early_init_devtree(void *); | ||
52 | extern int machine_is_compatible(const char *compat); | ||
53 | extern void print_properties(struct device_node *node); | ||
54 | extern int prom_n_intr_cells(struct device_node *np); | ||
55 | extern void prom_get_irq_senses(unsigned char *senses, int off, int max); | ||
56 | extern int prom_add_property(struct device_node *np, struct property *prop); | ||
57 | extern int prom_remove_property(struct device_node *np, struct property *prop); | ||
58 | extern int prom_update_property(struct device_node *np, | ||
59 | struct property *newprop, | ||
60 | struct property *oldprop); | ||
61 | 49 | ||
62 | extern struct resource *request_OF_resource(struct device_node *node, | 50 | extern struct resource *request_OF_resource(struct device_node *node, |
63 | int index, const char *name_postfix); | 51 | int index, const char *name_postfix); |
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h index c8b59330b04a..2ab9cbd98826 100644 --- a/arch/powerpc/include/asm/prom.h +++ b/arch/powerpc/include/asm/prom.h | |||
@@ -38,20 +38,6 @@ extern struct device_node *of_chosen; | |||
38 | extern void of_attach_node(struct device_node *); | 38 | extern void of_attach_node(struct device_node *); |
39 | extern void of_detach_node(struct device_node *); | 39 | extern void of_detach_node(struct device_node *); |
40 | 40 | ||
41 | /* Other Prototypes */ | ||
42 | extern void finish_device_tree(void); | ||
43 | extern void unflatten_device_tree(void); | ||
44 | extern void early_init_devtree(void *); | ||
45 | extern int machine_is_compatible(const char *compat); | ||
46 | extern void print_properties(struct device_node *node); | ||
47 | extern int prom_n_intr_cells(struct device_node* np); | ||
48 | extern void prom_get_irq_senses(unsigned char *senses, int off, int max); | ||
49 | extern int prom_add_property(struct device_node* np, struct property* prop); | ||
50 | extern int prom_remove_property(struct device_node *np, struct property *prop); | ||
51 | extern int prom_update_property(struct device_node *np, | ||
52 | struct property *newprop, | ||
53 | struct property *oldprop); | ||
54 | |||
55 | #ifdef CONFIG_PPC32 | 41 | #ifdef CONFIG_PPC32 |
56 | /* | 42 | /* |
57 | * PCI <-> OF matching functions | 43 | * PCI <-> OF matching functions |