* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
		
			
				
	
	
		
			26 lines
		
	
	
		
			956 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			26 lines
		
	
	
		
			956 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
From c121f72a66c5f92fbe2fc53baa274eef39875cec Mon Sep 17 00:00:00 2001
 | 
						|
From: Colin Ian King <colin.king@canonical.com>
 | 
						|
Date: Mon, 24 Oct 2016 23:46:18 +0100
 | 
						|
Subject: [PATCH] net: bgmac: fix spelling mistake: "connecton" -> "connection"
 | 
						|
 | 
						|
trivial fix to spelling mistake in dev_err message
 | 
						|
 | 
						|
Signed-off-by: Colin Ian King <colin.king@canonical.com>
 | 
						|
Acked-by: Jon Mason <jon.mason@broadcom.com>
 | 
						|
Signed-off-by: David S. Miller <davem@davemloft.net>
 | 
						|
---
 | 
						|
 drivers/net/ethernet/broadcom/bgmac.c | 2 +-
 | 
						|
 1 file changed, 1 insertion(+), 1 deletion(-)
 | 
						|
 | 
						|
--- a/drivers/net/ethernet/broadcom/bgmac.c
 | 
						|
+++ b/drivers/net/ethernet/broadcom/bgmac.c
 | 
						|
@@ -1468,7 +1468,7 @@ static int bgmac_phy_connect(struct bgma
 | 
						|
 	phy_dev = phy_connect(bgmac->net_dev, bus_id, &bgmac_adjust_link,
 | 
						|
 			      PHY_INTERFACE_MODE_MII);
 | 
						|
 	if (IS_ERR(phy_dev)) {
 | 
						|
-		dev_err(bgmac->dev, "PHY connecton failed\n");
 | 
						|
+		dev_err(bgmac->dev, "PHY connection failed\n");
 | 
						|
 		return PTR_ERR(phy_dev);
 | 
						|
 	}
 | 
						|
 
 |