ARM: tegra: Remove asim check in SMSC911X init
Edgardo Handal [Mon, 25 Mar 2013 20:48:21 +0000 (15:48 -0500)]
Change-Id: I446e1452d3a628e764e78b5f5795dff8a46143d7
Signed-off-by: Edgardo Handal <ehandal@nvidia.com>
Reviewed-on: http://git-master/r/212772
Reviewed-by: Matt Craighead <mcraighead@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Chao Xu <cxu@nvidia.com>

arch/arm/mach-tegra/board-bonaire.c
arch/arm/mach-tegra/common.c

index ddef107..14ab8fa 100644 (file)
@@ -37,9 +37,6 @@
 #include <linux/input.h>
 #include <linux/platform_data/tegra_usb.h>
 #include <linux/tegra_uart.h>
-#if defined(CONFIG_SMSC911X)
-#include <linux/smsc911x.h>
-#endif
 #include <mach/clk.h>
 #include <mach/gpio-tegra.h>
 #include <mach/iomap.h>
index 69841b6..e251ad7 100644 (file)
@@ -33,6 +33,9 @@
 #include <linux/pstore_ram.h>
 #include <linux/dma-mapping.h>
 #include <linux/sys_soc.h>
+#if defined(CONFIG_SMSC911X)
+#include <linux/smsc911x.h>
+#endif
 
 #include <linux/export.h>
 #include <linux/bootmem.h>
@@ -2130,14 +2133,14 @@ static struct platform_device tegra_smsc911x_device = {
        .dev.platform_data = &tegra_smsc911x_config,
 };
 
-static int __init asim_enet_smsc911x_init(void)
+static int __init enet_smsc911x_init(void)
 {
-       if (tegra_cpu_is_asim() && !tegra_cpu_is_dsim())
+       if (!tegra_cpu_is_dsim())
                platform_device_register(&tegra_smsc911x_device);
        return 0;
 }
 
-rootfs_initcall(asim_enet_smsc911x_init);
+rootfs_initcall(enet_smsc911x_init);
 #endif
 
 #ifdef CONFIG_TEGRA_SIMULATION_SPLIT_MEM