Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 130919
b: refs/heads/master
c: 7f6678c
h: refs/heads/master
i:
  130917: b0f6dab
  130915: 488d8ab
  130911: 4def6de
v: v3
  • Loading branch information
Mike Frysinger authored and Bryan Wu committed Feb 4, 2009
1 parent ce251a3 commit b643fb4
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 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: 2678479c33774f297ea2a5d232cad11c4d56ef6c
refs/heads/master: 7f6678c52fea7ff3e7eb6a5f0e0b705c1991eaa2
4 changes: 2 additions & 2 deletions trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@ static struct platform_device *stamp_devices[] __initdata = {
&bfin_gpios_device,
};

static int __init stamp_init(void)
static int __init cm_init(void)
{
printk(KERN_INFO "%s(): registering device resources\n", __func__);
i2c_register_board_info(0, bfin_i2c_board_info,
Expand All @@ -976,7 +976,7 @@ static int __init stamp_init(void)
return 0;
}

arch_initcall(stamp_init);
arch_initcall(cm_init);

void native_machine_restart(char *cmd)
{
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/blackfin/mach-bf527/boards/ezbrd.c
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ static struct platform_device *stamp_devices[] __initdata = {
&bfin_gpios_device,
};

static int __init stamp_init(void)
static int __init ezbrd_init(void)
{
printk(KERN_INFO "%s(): registering device resources\n", __func__);
i2c_register_board_info(0, bfin_i2c_board_info,
Expand All @@ -772,7 +772,7 @@ static int __init stamp_init(void)
return 0;
}

arch_initcall(stamp_init);
arch_initcall(ezbrd_init);

void native_machine_restart(char *cmd)
{
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/blackfin/mach-bf527/boards/ezkit.c
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,7 @@ static struct platform_device *stamp_devices[] __initdata = {
&bfin_gpios_device,
};

static int __init stamp_init(void)
static int __init ezkit_init(void)
{
printk(KERN_INFO "%s(): registering device resources\n", __func__);
i2c_register_board_info(0, bfin_i2c_board_info,
Expand All @@ -1056,7 +1056,7 @@ static int __init stamp_init(void)
return 0;
}

arch_initcall(stamp_init);
arch_initcall(ezkit_init);

void native_machine_restart(char *cmd)
{
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/blackfin/mach-bf537/boards/generic_board.c
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ static struct platform_device *stamp_devices[] __initdata = {
#endif
};

static int __init stamp_init(void)
static int __init generic_init(void)
{
printk(KERN_INFO "%s(): registering device resources\n", __func__);
platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));
Expand All @@ -720,7 +720,7 @@ static int __init stamp_init(void)
return 0;
}

arch_initcall(stamp_init);
arch_initcall(generic_init);

void native_machine_restart(char *cmd)
{
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/blackfin/mach-bf537/boards/pnav10.c
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ static struct platform_device *stamp_devices[] __initdata = {
#endif
};

static int __init stamp_init(void)
static int __init pnav_init(void)
{
printk(KERN_INFO "%s(): registering device resources\n", __func__);
platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));
Expand All @@ -569,7 +569,7 @@ static int __init stamp_init(void)
return 0;
}

arch_initcall(stamp_init);
arch_initcall(pnav_init);

void bfin_get_ether_addr(char *addr)
{
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/blackfin/mach-bf537/boards/tcm_bf537.c
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ static struct platform_device *cm_bf537_devices[] __initdata = {
&bfin_gpios_device,
};

static int __init cm_bf537_init(void)
static int __init tcm_bf537_init(void)
{
printk(KERN_INFO "%s(): registering device resources\n", __func__);
platform_add_devices(cm_bf537_devices, ARRAY_SIZE(cm_bf537_devices));
Expand All @@ -629,7 +629,7 @@ static int __init cm_bf537_init(void)
return 0;
}

arch_initcall(cm_bf537_init);
arch_initcall(tcm_bf537_init);

void bfin_get_ether_addr(char *addr)
{
Expand Down

0 comments on commit b643fb4

Please sign in to comment.