Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 333324
b: refs/heads/master
c: c09fcc4
h: refs/heads/master
v: v3
  • Loading branch information
Peter Senna Tschudin authored and Tony Lindgren committed Oct 9, 2012
1 parent 62b9ead commit 73c46c3
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 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: 11eff2788a1eb035693aa675504a40e72c920b61
refs/heads/master: c09fcc438ca7b5498f74e4fcd0b0ce691b4fca5c
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/board-flash.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ void __init board_flash_init(struct flash_partitions partition_info[],
if (onenandcs > GPMC_CS_NUM)
onenandcs = cs;
break;
};
}
cs++;
}

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/clkt_clksel.c
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ void omap2_init_clksel_parent(struct clk *clk)
__clk_get_name(parent) :
"NULL"));
clk_reparent(clk, clks->parent);
};
}
found = 1;
}
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/mux.c
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state)
default:
/* Nothing to be done */
break;
};
}

if (val >= 0) {
omap_mux_write(pad->partition, val,
Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -3738,7 +3738,7 @@ int __init omap3xxx_hwmod_init(void)
} else {
WARN(1, "OMAP3 hwmod family init: unknown chip type\n");
return -EINVAL;
};
}

r = omap_hwmod_register_links(h);
if (r < 0)
Expand All @@ -3755,7 +3755,7 @@ int __init omap3xxx_hwmod_init(void)
rev == OMAP3430_REV_ES3_0 || rev == OMAP3430_REV_ES3_1 ||
rev == OMAP3430_REV_ES3_1_2) {
h = omap3430es2plus_hwmod_ocp_ifs;
};
}

if (h) {
r = omap_hwmod_register_links(h);
Expand All @@ -3770,7 +3770,7 @@ int __init omap3xxx_hwmod_init(void)
} else if (rev == OMAP3430_REV_ES3_0 || rev == OMAP3430_REV_ES3_1 ||
rev == OMAP3430_REV_ES3_1_2) {
h = omap3430_es3plus_hwmod_ocp_ifs;
};
}

if (h)
r = omap_hwmod_register_links(h);
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/pm-debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ static int pm_dbg_open(struct inode *inode, struct file *file)
default:
return single_open(file, pm_dbg_show_timers,
&inode->i_private);
};
}
}

static const struct file_operations debug_fops = {
Expand Down

0 comments on commit 73c46c3

Please sign in to comment.