From: 刘益星 <lyx@rock-chips.com>
Date: Tue, 1 Jun 2010 07:26:28 +0000 (+0000)
Subject: modify dm9000
X-Git-Tag: firefly_0821_release~11431
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f625ea82d158647fe29c9d467cf8bd7b51623af9;p=firefly-linux-kernel-4.4.55.git

modify dm9000
---

diff --git a/arch/arm/mach-rk2818/board-midsdk.c b/arch/arm/mach-rk2818/board-midsdk.c
index 375e4cdcec0d..d33e7f2a9c72 100644
--- a/arch/arm/mach-rk2818/board-midsdk.c
+++ b/arch/arm/mach-rk2818/board-midsdk.c
@@ -400,7 +400,9 @@ struct rk2818bl_info rk2818_bl_info = {
 
 static struct platform_device *devices[] __initdata = {
 	&rk2818_device_uart1,
+#ifdef CONFIG_DM9000
 	&rk2818_device_dm9k,
+#endif
 #ifdef CONFIG_I2C0_RK2818
 	&rk2818_device_i2c0,
 #endif
diff --git a/arch/arm/mach-rk2818/devices.c b/arch/arm/mach-rk2818/devices.c
index 21db7b6d527a..b2070d4398e0 100644
--- a/arch/arm/mach-rk2818/devices.c
+++ b/arch/arm/mach-rk2818/devices.c
@@ -260,6 +260,7 @@ struct platform_device rk2818_device_backlight = {
 
 //net device
 /* DM9000 */
+#ifdef CONFIG_DM9000
 static struct resource dm9k_resource[] = {
 	[0] = {
 		.start = RK2818_NANDC_PHYS + 0x800 + (1*0x100 + 0x8),    //nand_cs1+nand_cmd
@@ -296,6 +297,7 @@ struct platform_device rk2818_device_dm9k = {
 		.platform_data = &dm9k_platdata,
 	}
 };
+#endif
 
 /*ADC*/
 static struct resource rk2818_adc_resource[] = {