diff --git a/patch/kernel/mvebu-current/need-checking/402-sfp-display-SFP-module-information.patch b/patch/kernel/mvebu-current/402-sfp-display-SFP-module-information.patch
similarity index 92%
rename from patch/kernel/mvebu-current/need-checking/402-sfp-display-SFP-module-information.patch
rename to patch/kernel/mvebu-current/402-sfp-display-SFP-module-information.patch
index af1776bb72..d81648620b 100644
--- a/patch/kernel/mvebu-current/need-checking/402-sfp-display-SFP-module-information.patch
+++ b/patch/kernel/mvebu-current/402-sfp-display-SFP-module-information.patch
@@ -144,25 +144,25 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 +static const char *sfp_connector(unsigned int connector)
 +{
 +	switch (connector) {
-+	case SFP_CONNECTOR_UNSPEC:
++	case SFF8024_CONNECTOR_UNSPEC:
 +		return "unknown/unspecified";
-+	case SFP_CONNECTOR_SC:
++	case SFF8024_CONNECTOR_SC:
 +		return "SC";
-+	case SFP_CONNECTOR_FIBERJACK:
++	case SFF8024_CONNECTOR_FIBERJACK:
 +		return "Fiberjack";
-+	case SFP_CONNECTOR_LC:
++	case SFF8024_CONNECTOR_LC:
 +		return "LC";
-+	case SFP_CONNECTOR_MT_RJ:
++	case SFF8024_CONNECTOR_MT_RJ:
 +		return "MT-RJ";
-+	case SFP_CONNECTOR_MU:
++	case SFF8024_CONNECTOR_MU:
 +		return "MU";
-+	case SFP_CONNECTOR_SG:
++	case SFF8024_CONNECTOR_SG:
 +		return "SG";
-+	case SFP_CONNECTOR_OPTICAL_PIGTAIL:
++	case SFF8024_CONNECTOR_OPTICAL_PIGTAIL:
 +		return "Optical pigtail";
-+	case SFP_CONNECTOR_HSSDC_II:
++	case SFF8024_CONNECTOR_HSSDC_II:
 +		return "HSSDC II";
-+	case SFP_CONNECTOR_COPPER_PIGTAIL:
++	case SFF8024_CONNECTOR_COPPER_PIGTAIL:
 +		return "Copper pigtail";
 +	default:
 +		return "unknown";
@@ -172,17 +172,17 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 +static const char *sfp_encoding(unsigned int encoding)
 +{
 +	switch (encoding) {
-+	case SFP_ENCODING_UNSPEC:
++	case SFF8024_ENCODING_UNSPEC:
 +		return "unspecified";
-+	case SFP_ENCODING_8472_64B66B:
++	case SFF8024_ENCODING_8472_64B66B:
 +		return "64b66b";
-+	case SFP_ENCODING_8B10B:
++	case SFF8024_ENCODING_8B10B:
 +		return "8b10b";
-+	case SFP_ENCODING_4B5B:
++	case SFF8024_ENCODING_4B5B:
 +		return "4b5b";
-+	case SFP_ENCODING_NRZ:
++	case SFF8024_ENCODING_NRZ:
 +		return "NRZ";
-+    case SFP_ENCODING_8472_MANCHESTER:
++    case SFF8024_ENCODING_8472_MANCHESTER:
 +		return "MANCHESTER";
 +	default:
 +		return "unknown";
diff --git a/patch/kernel/mvebu-dev/disabled/402-sfp-display-SFP-module-information.patch b/patch/kernel/mvebu-dev/402-sfp-display-SFP-module-information.patch
similarity index 92%
rename from patch/kernel/mvebu-dev/disabled/402-sfp-display-SFP-module-information.patch
rename to patch/kernel/mvebu-dev/402-sfp-display-SFP-module-information.patch
index af1776bb72..d81648620b 100644
--- a/patch/kernel/mvebu-dev/disabled/402-sfp-display-SFP-module-information.patch
+++ b/patch/kernel/mvebu-dev/402-sfp-display-SFP-module-information.patch
@@ -144,25 +144,25 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 +static const char *sfp_connector(unsigned int connector)
 +{
 +	switch (connector) {
-+	case SFP_CONNECTOR_UNSPEC:
++	case SFF8024_CONNECTOR_UNSPEC:
 +		return "unknown/unspecified";
-+	case SFP_CONNECTOR_SC:
++	case SFF8024_CONNECTOR_SC:
 +		return "SC";
-+	case SFP_CONNECTOR_FIBERJACK:
++	case SFF8024_CONNECTOR_FIBERJACK:
 +		return "Fiberjack";
-+	case SFP_CONNECTOR_LC:
++	case SFF8024_CONNECTOR_LC:
 +		return "LC";
-+	case SFP_CONNECTOR_MT_RJ:
++	case SFF8024_CONNECTOR_MT_RJ:
 +		return "MT-RJ";
-+	case SFP_CONNECTOR_MU:
++	case SFF8024_CONNECTOR_MU:
 +		return "MU";
-+	case SFP_CONNECTOR_SG:
++	case SFF8024_CONNECTOR_SG:
 +		return "SG";
-+	case SFP_CONNECTOR_OPTICAL_PIGTAIL:
++	case SFF8024_CONNECTOR_OPTICAL_PIGTAIL:
 +		return "Optical pigtail";
-+	case SFP_CONNECTOR_HSSDC_II:
++	case SFF8024_CONNECTOR_HSSDC_II:
 +		return "HSSDC II";
-+	case SFP_CONNECTOR_COPPER_PIGTAIL:
++	case SFF8024_CONNECTOR_COPPER_PIGTAIL:
 +		return "Copper pigtail";
 +	default:
 +		return "unknown";
@@ -172,17 +172,17 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 +static const char *sfp_encoding(unsigned int encoding)
 +{
 +	switch (encoding) {
-+	case SFP_ENCODING_UNSPEC:
++	case SFF8024_ENCODING_UNSPEC:
 +		return "unspecified";
-+	case SFP_ENCODING_8472_64B66B:
++	case SFF8024_ENCODING_8472_64B66B:
 +		return "64b66b";
-+	case SFP_ENCODING_8B10B:
++	case SFF8024_ENCODING_8B10B:
 +		return "8b10b";
-+	case SFP_ENCODING_4B5B:
++	case SFF8024_ENCODING_4B5B:
 +		return "4b5b";
-+	case SFP_ENCODING_NRZ:
++	case SFF8024_ENCODING_NRZ:
 +		return "NRZ";
-+    case SFP_ENCODING_8472_MANCHESTER:
++    case SFF8024_ENCODING_8472_MANCHESTER:
 +		return "MANCHESTER";
 +	default:
 +		return "unknown";