From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/drivers/staging/netlogic/platform_net.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'kernel/drivers/staging/netlogic/platform_net.c') diff --git a/kernel/drivers/staging/netlogic/platform_net.c b/kernel/drivers/staging/netlogic/platform_net.c index 77c3c3522..7806c2bc3 100644 --- a/kernel/drivers/staging/netlogic/platform_net.c +++ b/kernel/drivers/staging/netlogic/platform_net.c @@ -58,7 +58,6 @@ #define MAX_NUM_XLS_GMAC 8 #define MAX_NUM_XLR_GMAC 4 - static u32 xlr_gmac_offsets[] = { NETLOGIC_IO_GMAC_0_OFFSET, NETLOGIC_IO_GMAC_1_OFFSET, NETLOGIC_IO_GMAC_2_OFFSET, NETLOGIC_IO_GMAC_3_OFFSET, @@ -163,7 +162,7 @@ static void xls_gmac_init(void) switch (nlm_prom_info.board_major_version) { case 12: /* first block RGMII or XAUI, use RGMII */ - ndata0.phy_interface = PHY_INTERFACE_MODE_RGMII, + ndata0.phy_interface = PHY_INTERFACE_MODE_RGMII; ndata0.tx_stnid[0] = FMN_STNID_GMAC0_TX0; ndata0.phy_addr[0] = 0; -- cgit 1.2.3-korg