Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 123121
b: refs/heads/master
c: e14d774
h: refs/heads/master
i:
  123119: 8aa2134
v: v3
  • Loading branch information
Grant Erickson authored and Paul Mackerras committed Dec 21, 2008
1 parent 5db66f8 commit 7112ffe
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9dce3ce5c55c848f00429005a46fd6246cfabfbe
refs/heads/master: e14d77490d3e1da833cff4fee52674c52684ce77
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/include/asm/dcr.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ typedef dcr_host_mmio_t dcr_host_t;
* additional helpers to read the DCR * base from the device-tree
*/
struct device_node;
extern unsigned int dcr_resource_start(struct device_node *np,
extern unsigned int dcr_resource_start(const struct device_node *np,
unsigned int index);
extern unsigned int dcr_resource_len(struct device_node *np,
extern unsigned int dcr_resource_len(const struct device_node *np,
unsigned int index);
#endif /* CONFIG_PPC_DCR */
#endif /* __ASSEMBLY__ */
Expand Down
5 changes: 3 additions & 2 deletions trunk/arch/powerpc/sysdev/dcr.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ EXPORT_SYMBOL_GPL(dcr_write_generic);

#endif /* defined(CONFIG_PPC_DCR_NATIVE) && defined(CONFIG_PPC_DCR_MMIO) */

unsigned int dcr_resource_start(struct device_node *np, unsigned int index)
unsigned int dcr_resource_start(const struct device_node *np,
unsigned int index)
{
unsigned int ds;
const u32 *dr = of_get_property(np, "dcr-reg", &ds);
Expand All @@ -136,7 +137,7 @@ unsigned int dcr_resource_start(struct device_node *np, unsigned int index)
}
EXPORT_SYMBOL_GPL(dcr_resource_start);

unsigned int dcr_resource_len(struct device_node *np, unsigned int index)
unsigned int dcr_resource_len(const struct device_node *np, unsigned int index)
{
unsigned int ds;
const u32 *dr = of_get_property(np, "dcr-reg", &ds);
Expand Down

0 comments on commit 7112ffe

Please sign in to comment.