diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2017-10-10 21:25:20 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2017-10-10 21:25:20 +0100 |
| commit | a73aa8eb0f0da3d5dfaf93efeaa4c6698d11416d (patch) | |
| tree | a4e28f10798952381cf39cb3221c62fef9750f18 | |
| parent | b6185213fc0f917253e5ad6699353d0483613f1b (diff) | |
| download | kernel-a73aa8eb0f0da3d5dfaf93efeaa4c6698d11416d.tar.gz kernel-a73aa8eb0f0da3d5dfaf93efeaa4c6698d11416d.tar.xz kernel-a73aa8eb0f0da3d5dfaf93efeaa4c6698d11416d.zip | |
fix and re-enable the socionext NIC
| -rw-r--r-- | arm64-socionext-96b-enablement.patch | 48 | ||||
| -rw-r--r-- | baseconfig/arm/arm64/CONFIG_SNI_NETSEC | 2 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-aarch64.config | 2 |
4 files changed, 51 insertions, 3 deletions
diff --git a/arm64-socionext-96b-enablement.patch b/arm64-socionext-96b-enablement.patch index 52bae8817..b82067ea4 100644 --- a/arm64-socionext-96b-enablement.patch +++ b/arm64-socionext-96b-enablement.patch @@ -3048,3 +3048,51 @@ index 0000000..4695969 -- cgit v1.1 +From d2fc584f8237746a84e6ec8690d8884f148fc449 Mon Sep 17 00:00:00 2001 +From: Peter Robinson <pbrobinson@gmail.com> +Date: Tue, 10 Oct 2017 11:35:51 +0100 +Subject: [PATCH] add interrupt.h, sort alphabetically + +Signed-off-by: Peter Robinson <pbrobinson@gmail.com> +--- + drivers/net/ethernet/socionext/netsec/netsec_platform.c | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +diff --git a/drivers/net/ethernet/socionext/netsec/netsec_platform.c b/drivers/net/ethernet/socionext/netsec/netsec_platform.c +index 624f6a7093f6..79072bae917d 100644 +--- a/drivers/net/ethernet/socionext/netsec/netsec_platform.c ++++ b/drivers/net/ethernet/socionext/netsec/netsec_platform.c +@@ -14,21 +14,22 @@ + */ + + #include <linux/acpi.h> +-#include <linux/device.h> +-#include <linux/ctype.h> +-#include <linux/netdevice.h> +-#include <linux/types.h> + #include <linux/bitops.h> ++#include <linux/clk.h> ++#include <linux/ctype.h> ++#include <linux/device.h> + #include <linux/dma-mapping.h> ++#include <linux/io.h> ++#include <linux/interrupt.h> + #include <linux/module.h> +-#include <linux/sizes.h> +-#include <linux/platform_device.h> +-#include <linux/clk.h> ++#include <linux/netdevice.h> + #include <linux/of.h> + #include <linux/of_device.h> + #include <linux/of_net.h> +-#include <linux/io.h> ++#include <linux/platform_device.h> + #include <linux/pm_runtime.h> ++#include <linux/sizes.h> ++#include <linux/types.h> + + #include "netsec.h" + +-- +2.14.2 + diff --git a/baseconfig/arm/arm64/CONFIG_SNI_NETSEC b/baseconfig/arm/arm64/CONFIG_SNI_NETSEC index 2a7609395..c348519ff 100644 --- a/baseconfig/arm/arm64/CONFIG_SNI_NETSEC +++ b/baseconfig/arm/arm64/CONFIG_SNI_NETSEC @@ -1 +1 @@ -# CONFIG_SNI_NETSEC is not set +CONFIG_SNI_NETSEC=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 156e22488..8f666e877 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -5388,7 +5388,7 @@ CONFIG_SND_VIRMIDI=m CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m -# CONFIG_SNI_NETSEC is not set +CONFIG_SNI_NETSEC=m # CONFIG_SOC_BRCMSTB is not set # CONFIG_SOC_CAMERA is not set CONFIG_SOCIONEXT_SYNQUACER_PREITS=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 3b61716fa..2576f26e5 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -5365,7 +5365,7 @@ CONFIG_SND_VIRMIDI=m CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m -# CONFIG_SNI_NETSEC is not set +CONFIG_SNI_NETSEC=m # CONFIG_SOC_BRCMSTB is not set # CONFIG_SOC_CAMERA is not set CONFIG_SOCIONEXT_SYNQUACER_PREITS=y |