Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 370586
b: refs/heads/master
c: 77e2fd8
h: refs/heads/master
v: v3
  • Loading branch information
Mark A. Greer authored and Paul Walmsley committed Mar 30, 2013
1 parent 0c275ac commit d6ae1f6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 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: 14ae5564eb9c252319a4dba5aef0a66ad5eaff56
refs/heads/master: 77e2fd8465b8297fc3a1b01148714fa421b5c0c8
22 changes: 9 additions & 13 deletions trunk/arch/arm/mach-omap2/devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -519,19 +519,15 @@ static void __init omap_init_sham(void)

static void __init omap_init_aes(void)
{
if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
struct omap_hwmod *oh;
struct platform_device *pdev;

oh = omap_hwmod_lookup("aes");
if (!oh)
return;

pdev = omap_device_build("omap-aes", -1, oh, NULL, 0);
WARN(IS_ERR(pdev), "Can't build omap_device for omap-aes\n");
} else {
pr_err("%s: platform not supported\n", __func__);
}
struct omap_hwmod *oh;
struct platform_device *pdev;

oh = omap_hwmod_lookup("aes");
if (!oh)
return;

pdev = omap_device_build("omap-aes", -1, oh, NULL, 0);
WARN(IS_ERR(pdev), "Can't build omap_device for omap-aes\n");
}

/*-------------------------------------------------------------------------*/
Expand Down

0 comments on commit d6ae1f6

Please sign in to comment.