diff options
author | Tony Lindgren <tony@atomide.com> | 2010-03-09 17:59:48 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-03-09 19:39:58 -0500 |
commit | d2197e1e6038bb01568367a220e4a4e040f8337d (patch) | |
tree | 699227f0a8b8b8dc649ab9cfc371c2bafd8c445d /arch/arm/mach-omap2/board-omap3touchbook.c | |
parent | 57d54889cd00db2752994b389ba714138652e60c (diff) |
omap3: Fix compile for Touch Book early_param
Commit 2b0d8c251b8876d530a6bf671eb5425838fa698a changed ARM to use
the common early_param code. Fix compile for Touch Book accordingly.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3touchbook.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3touchbook.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index 3943d0f8322c..2a5bf5cea883 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c | |||
@@ -518,14 +518,14 @@ static void omap3_touchbook_poweroff(void) | |||
518 | gpio_direction_output(TB_KILL_POWER_GPIO, 0); | 518 | gpio_direction_output(TB_KILL_POWER_GPIO, 0); |
519 | } | 519 | } |
520 | 520 | ||
521 | static void __init early_touchbook_revision(char **p) | 521 | static int __init early_touchbook_revision(char *p) |
522 | { | 522 | { |
523 | if (!*p) | 523 | if (!p) |
524 | return; | 524 | return 0; |
525 | 525 | ||
526 | strict_strtoul(*p, 10, &touchbook_revision); | 526 | return strict_strtoul(p, 10, &touchbook_revision); |
527 | } | 527 | } |
528 | __early_param("tbr=", early_touchbook_revision); | 528 | early_param("tbr", early_touchbook_revision); |
529 | 529 | ||
530 | static struct omap_musb_board_data musb_board_data = { | 530 | static struct omap_musb_board_data musb_board_data = { |
531 | .interface_type = MUSB_INTERFACE_ULPI, | 531 | .interface_type = MUSB_INTERFACE_ULPI, |