Revert "temp revert rk change"

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-rk29 / include / mach / board.h

diff --git a/arch/arm/mach-rk29/include/mach/board.h b/arch/arm/mach-rk29/include/mach/board.h
index 7cec44db21f5fab5052a14becd312d9dd91637d4..d56c42310dba35379f686cc570158b2e1b6883bd 100755 (executable)
--- a/arch/arm/mach-rk29/include/mach/board.h
+++ b/arch/arm/mach-rk29/include/mach/board.h
@@ -124,6 +124,7 @@ struct rk29_bl_info{
        unsigned int delay_ms;  /* in milliseconds */
 };
 
+#ifndef _LINUX_WLAN_PLAT_H_
 struct wifi_platform_data {
         int (*set_power)(int val);
         int (*set_reset)(int val);
@@ -131,6 +132,7 @@ struct wifi_platform_data {
         void *(*mem_prealloc)(int section, unsigned long size);
         int (*get_mac_addr)(unsigned char *buf);
 };
+#endif
 
 struct rk29_sdmmc_platform_data {
        unsigned int host_caps;