Skip to content

Commit

Permalink
davinci: Move DA8xx/OMAP-L13x emac register routine
Browse files Browse the repository at this point in the history
Some mcasp code was inserted between the emac resource setup
and the related register routine that registers the emac.

Signed-off-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
  • Loading branch information
Mark A. Greer authored and Kevin Hilman committed Nov 25, 2009
1 parent e9ab321 commit 31f53cf
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/arm/mach-davinci/devices-da8xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,11 @@ static struct platform_device da8xx_emac_device = {
.resource = da8xx_emac_resources,
};

int __init da8xx_register_emac(void)
{
return platform_device_register(&da8xx_emac_device);
}

static struct resource da830_mcasp1_resources[] = {
{
.name = "mcasp1",
Expand Down Expand Up @@ -338,11 +343,6 @@ static struct platform_device da850_mcasp_device = {
.resource = da850_mcasp_resources,
};

int __init da8xx_register_emac(void)
{
return platform_device_register(&da8xx_emac_device);
}

void __init da8xx_init_mcasp(int id, struct snd_platform_data *pdata)
{
/* DA830/OMAP-L137 has 3 instances of McASP */
Expand Down

0 comments on commit 31f53cf

Please sign in to comment.