From e32d626a2cfc6401f61b2902ef9b065d7f612e2a Mon Sep 17 00:00:00 2001 From: Chunhe Lan Date: Fri, 26 Apr 2013 17:26:01 +0800 Subject: fmd: fix the build error for P1023 Fman Remove the define of FM_CAPWAP_SUPPORT from P1023/dpaa_integration_ext.h. Or building p1023rds with Fman support will fail with the error message: In file included from drivers/net/ethernet/freescale/fman/src/ wrapper/lnxwrp_ioctls_fm.c:70:0: include/uapi/linux/fmd/Peripherals/fm_pcd_ioctls.h:119:2: error: ................ ................ make[7]: *** [drivers/net/ethernet/freescale/fman/src/wrapper/ lnxwrp_ioctls_fm.o] Error 1 make[6]: *** [drivers/net/ethernet/freescale/fman/src/wrapper] Error 2 make[5]: *** [drivers/net/ethernet/freescale/fman/src] Error 2 make[4]: *** [drivers/net/ethernet/freescale/fman] Error 2 make[3]: *** [drivers/net/ethernet/freescale] Error 2 make[2]: *** [drivers/net/ethernet] Error 2 make[1]: *** [drivers/net] Error 2 make: *** [drivers] Error 2 Signed-off-by: Chunhe Lan Change-Id: I38009e5227de84cf47526c024c65ae645b364891 Reviewed-on: http://git.am.freescale.net:8181/2136 Reviewed-by: Zang Tiefei-R61911 Reviewed-by: Fleming Andrew-AFLEMING Tested-by: Fleming Andrew-AFLEMING diff --git a/drivers/net/ethernet/freescale/fman/inc/integrations/P1023/dpaa_integration_ext.h b/drivers/net/ethernet/freescale/fman/inc/integrations/P1023/dpaa_integration_ext.h index fabf8db..cbc322a 100644 --- a/drivers/net/ethernet/freescale/fman/inc/integrations/P1023/dpaa_integration_ext.h +++ b/drivers/net/ethernet/freescale/fman/inc/integrations/P1023/dpaa_integration_ext.h @@ -123,7 +123,6 @@ typedef enum { #define FM_MAX_NUM_OF_MACSECS 1 #define FM_MACSEC_SUPPORT -#define FM_CAPWAP_SUPPORT #define FM_LOW_END_RESTRICTION /* prevents the use of TX port 1 with OP port 0 */ -- cgit v0.10.2