]> git.karo-electronics.de Git - linux-beck.git/commitdiff
davinci: Move DA8xx/OMAP-L13x emac register routine
authorMark A. Greer <mgreer@mvista.com>
Fri, 28 Aug 2009 22:02:54 +0000 (15:02 -0700)
committerKevin Hilman <khilman@deeprootsystems.com>
Wed, 25 Nov 2009 18:21:18 +0000 (10:21 -0800)
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>
arch/arm/mach-davinci/devices-da8xx.c

index 58ad5b66fd60e828df7b07e25eaf03ca4f774d6d..94ce7a15c72834703c3f9908e5b15ba330d803d9 100644 (file)
@@ -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",
@@ -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 */