Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 81160
b: refs/heads/master
c: b91bdd1
h: refs/heads/master
v: v3
  • Loading branch information
Stephen Rothwell authored and Paul Mackerras committed Dec 21, 2007
1 parent 7432f55 commit dbcfde0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 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: 92d1616ec0302266dd753a6c2fc5b2f6e7d36a72
refs/heads/master: b91bdd15174ca7104905d74aaf89a6815c3f9d8c
8 changes: 4 additions & 4 deletions trunk/arch/powerpc/kernel/of_platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* a bus type in the list
*/

static struct of_device_id of_default_bus_ids[] = {
static const struct of_device_id of_default_bus_ids[] = {
{ .type = "soc", },
{ .compatible = "soc", },
{ .type = "spider", },
Expand Down Expand Up @@ -100,8 +100,8 @@ EXPORT_SYMBOL(of_platform_device_create);
* @matches: match table, NULL to use the default, OF_NO_DEEP_PROBE to
* disallow recursive creation of child busses
*/
static int of_platform_bus_create(struct device_node *bus,
struct of_device_id *matches,
static int of_platform_bus_create(const struct device_node *bus,
const struct of_device_id *matches,
struct device *parent)
{
struct device_node *child;
Expand Down Expand Up @@ -137,7 +137,7 @@ static int of_platform_bus_create(struct device_node *bus,
*/

int of_platform_bus_probe(struct device_node *root,
struct of_device_id *matches,
const struct of_device_id *matches,
struct device *parent)
{
struct device_node *child;
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-powerpc/of_platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ extern struct of_device *of_platform_device_create(struct device_node *np,
#define OF_NO_DEEP_PROBE ((struct of_device_id *)-1)

extern int of_platform_bus_probe(struct device_node *root,
struct of_device_id *matches,
const struct of_device_id *matches,
struct device *parent);

extern struct of_device *of_find_device_by_phandle(phandle ph);
Expand Down

0 comments on commit dbcfde0

Please sign in to comment.